Update workflow

Author: HyperWinX

.github/Dockerfile .github/docker/clang/Dockerfile.github/Dockerfile renamed to .github/docker/clang/Dockerfile

@@ -4,7 +4,7 @@ ARG USER=ci
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates curl git      \
-    build-essential gcc g++       \
+    build-essential               \
     clang lld ninja-build sudo    \
     python3 python3-pip cmake     \
     && rm -rf /var/lib/apt/lists/*

.github/docker/gcc/Dockerfile

@@ -0,0 +1,17 @@
+FROM debian:latest
+
+ARG USER=ci
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates curl git      \
+    build-essential gcc g++       \
+    lld ninja-build sudo          \
+    python3 python3-pip cmake     \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pip install conan --break-system-packages
+
+RUN useradd -m ${USER} \
+    && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+WORKDIR /home/${USER}/workspace

.github/workflows/mainline-compile.yml

@@ -8,7 +8,7 @@ jobs:
     name: Compile (${{ matrix.compiler }})
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/hypercpu-project/hypercpu-builder:latest
+      image: ghcr.io/hypercpu-project/hypercpu-builder-${{ matrix.compiler }}:latest
       options: --init
     permissions:
       contents: read
@@ -27,15 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install dependencies with Conan
-        run: |
-          if [ "${{ matrix.compiler }}" = "clang" ]; then
-            export CC=$(which clang)
-            export CXX=$(which clang++)
-          else
-            export CC=$(which gcc)
-            export CXX=$(which g++)
-          fi
-          sudo -u ci env CC=$CC CXX=$CXX conan profile detect
+        run: sudo -u ci conan profile detect
 
       - name: Fix permissions
         run: chown -R ci:ci "$GITHUB_WORKSPACE"

.github/workflows/mainline-prepare.yml

@@ -24,12 +24,22 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build and push
+      - name: Build and push clang image
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: .github/Dockerfile
+          file: .github/docker/clang/Dockerfile
           push: true
-          tags: ghcr.io/hypercpu-project/hypercpu-builder:latest
+          tags: ghcr.io/hypercpu-project/hypercpu-builder-clang:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Build and push gcc image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: .github/docker/gcc/Dockerfile
+          push: true
+          tags: ghcr.io/hypercpu-project/hypercpu-builder-gcc:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max