chore: refresh images and adjust to main branch (#97)

hrzlgnm · Oct 26, 2024 · fa439b5 · fa439b5
1 parent d8c3ebb
commit fa439b5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/.codespellignore b/.codespellignore
@@ -1,3 +1,5 @@
 stoll
 deque
 musl
+tru
+fals
diff --git a/.github/docker/monkey-github-builder-clang/Dockerfile b/.github/docker/monkey-github-builder-clang/Dockerfile
@@ -1,9 +1,8 @@
 FROM debian:bookworm
 
 RUN \
-    sed -n -e 's/^deb /deb-src /p' /etc/apt/sources.list >/etc/apt/sources.list.d/monkey-sources.list && \
     apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
     build-essential \
     ca-certificates \
     clang-13 \
@@ -12,8 +11,7 @@ RUN \
     libc++-13-dev \
     libc++abi-13-dev \
     libc6-dev \
-    libstdc++-10-dev \
+    libstdc++-11-dev \
     ninja-build \
-    python3
-
-RUN rm -rf /var/lib/apt/lists/*
+    python3 && \
+    rm -rf /var/lib/apt/lists/*
diff --git a/.github/docker/monkey-github-builder-void-linux-musl-clang/Dockerfile b/.github/docker/monkey-github-builder-void-linux-musl-clang/Dockerfile
@@ -2,6 +2,6 @@ FROM ghcr.io/void-linux/void-musl
 RUN xbps-install -Syu || xbps-install -yu xbps \
     && xbps-install -yu \
     && xbps-install -y bash git cmake clang python3-codespell ninja clang clang-tools-extra cppcheck \
-    && xbps-remove -Oy
+    && xbps-remove -Ooy
 
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,17 +3,21 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - master
+      - main
 
   pull_request:
     branches:
-      - master
+      - main
+
+concurrency:
+  group: ${{ format('ci-{0}', github.ref) }}
+  cancel-in-progress: true
 
 jobs:
   Lint:
     runs-on: ubuntu-latest
     container:
-      image: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v1"
+      image: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v2"
 
     steps:
       - name: Checkout
@@ -47,7 +51,7 @@ jobs:
           - {
               runs_on: ubuntu-latest,
               name: "Clang 13 libc++",
-              container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v1",
+              container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v2",
               CC: clang-13,
               CXX: clang++-13,
               CFLAGS: "-stdlib=libc++",
@@ -58,7 +62,7 @@ jobs:
           - {
               runs_on: ubuntu-latest,
               name: "Clang 13 libstdc++",
-              container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v1",
+              container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v2",
               CC: clang-13,
               CXX: clang++-13,
               CFLAGS: "-stdlib=libstdc++",
@@ -69,7 +73,7 @@ jobs:
           - {
               runs_on: ubuntu-latest,
               name: "Clang 13 ASAN+UBSAN libstdc++",
-              container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v1",
+              container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v2",
               CC: clang-13,
               CXX: clang++-13,
               CFLAGS: "-fsanitize=address,undefined -fsanitize-address-use-after-scope -fno-sanitize-recover=address,undefined -stdlib=libstdc++",
@@ -81,7 +85,7 @@ jobs:
           - {
               runs_on: ubuntu-latest,
               name: "Clang 13 Release libstdc++",
-              container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v1",
+              container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v2",
               CC: clang-13,
               CXX: clang++-13,
               CFLAGS: "-stdlib=libstdc++",
@@ -92,7 +96,7 @@ jobs:
           - {
               runs_on: ubuntu-latest,
               name: "Clang 15 musl",
-              container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v1",
+              container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v2",
               CC: clang,
               CXX: clang++,
               CFLAGS: "",
@@ -103,7 +107,7 @@ jobs:
           - {
               runs_on: ubuntu-latest,
               name: "Clang 15 musl ASAN+UBSAN",
-              container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v1",
+              container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v2",
               CC: clang,
               CXX: clang++,
               CFLAGS: "-fsanitize=address,undefined -fsanitize-address-use-after-scope -fno-sanitize-recover=address,undefined -fuse-ld=gold",
@@ -115,7 +119,7 @@ jobs:
           - {
               runs_on: ubuntu-latest,
               name: "Clang 15 musl Release",
-              container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v1",
+              container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v2",
               CC: clang,
               CXX: clang++,
               CFLAGS: "",
@@ -187,7 +191,7 @@ jobs:
     needs: [Lint]
     runs-on: ubuntu-latest
     container:
-      image: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v1"
+      image: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v2"
 
     steps:
       - name: Checkout
-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
     stoll
     deque
     musl
+    tru
+    fals