missing xvfb

Reviewed-on: #11
Co-authored-by: Romain BOULLARD <romain.boullard@protonmail.com>
Co-committed-by: Romain BOULLARD <romain.boullard@protonmail.com>

.gitea/workflows/ci.yaml

@@ -10,7 +10,6 @@ env:
   BRANCH_NAME: ${{ github.ref_name }}
   BASE_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbasebuilder
   CPP_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxcppbuilder
-  BIGFOOT_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbigfootbuilder
 
 jobs:
   build-base-builder:
@@ -26,22 +25,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Set up Docker Buildx
+      - name: Build
-        uses: docker/setup-buildx-action@v3
+        run: |
+          docker build -t ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} --no-cache ./Linux/BaseBuilder
 
-      - name: Login to the Container registry
+      - name: Login to registry
-        uses: docker/login-action@v3
+        run: |
-        with:
+          echo "${{ secrets.DOCKER_TOKEN }}" | docker login ${{ vars.DOCKER_REGISTRY }} \
-          registry: ${{ vars.DOCKER_REGISTRY }}
+            -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build and push base builder
+      - name: Push
-        uses: docker/build-push-action@v5
+        run: |
-        with:
+          docker push ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-          context: ./Linux/BaseBuilder
-          push: true
-          tags: ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
 
   build-cpp-builder:
     runs-on: ubuntu-latest
@@ -57,55 +52,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Set up Docker Buildx
+      - name: Build
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build and push cpp builder
-        uses: docker/build-push-action@v5
-        with:
-          context: ./Linux/CPPBuilder
-          push: true
-          tags: ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-          build-args: |
-            BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-    runs-on: ubuntu-latest
-    timeout-minutes: 360
-    needs: build-cpp-builder
-
-    steps:
-      - name: Set ENV
         run: |
-          echo "BRANCH_NAME_LOWER=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+          docker build -t ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} --build-arg BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} --no-cache ./Linux/CPPBuilder
-          echo "BRANCH_NAME=$(echo $GITHUB_REF_NAME)" >> $GITHUB_ENV
 
-      - name: Checkout
+      - name: Login to registry
-        uses: actions/checkout@v6
+        run: |
+          echo "${{ secrets.DOCKER_TOKEN }}" | docker login ${{ vars.DOCKER_REGISTRY }} \
+            -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
-      - name: Set up Docker Buildx
+      - name: Push
-        uses: docker/setup-buildx-action@v3
+        run: |
-
+          docker push ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-      - name: Login to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build and push bigfoot builder
-        uses: docker/build-push-action@v5
-        with:
-          context: ./Linux/BigfootBuilder
-          push: true
-          tags: ${{ env.BIGFOOT_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-          build-args: |
-            BASE_BUILDER=${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-            CONAN_RELEASE_PROFILE=clang
-            CONAN_RELWITHDEBINFO_PROFILE=clangd
-            CONAN_DEBUG_PROFILE=clangd

Linux/BaseBuilder/Dockerfile

@@ -5,20 +5,12 @@ ENV TZ=Europe/Paris \
     DEBIAN_FRONTEND=noninteractive \
     PATH="/root/.local/bin:$PATH"
 
-# Use build cache for ccache
-RUN --mount=type=cache,target=/ccache
-
-# Dummy sudo (no security weakening)
 RUN echo '#!/bin/bash\n$@' > /usr/bin/sudo \
     && chmod +x /usr/bin/sudo
 
-# Install base dependencies in one layer
 RUN apt-get update && apt-get install -y \
         unzip \
         curl \
         wget \
-        lsb-release \
-        software-properties-common \
-        gnupg \
         python3 \
-    && rm -rf /var/lib/apt/lists/*
+        pipx

Linux/CPPBuilder/Dockerfile

@@ -1,78 +1,28 @@
-# Build arguments
 ARG BASE_BUILDER
 
-# Base image
 FROM $BASE_BUILDER
 
-# Install system dependencies
 RUN apt-get update && apt-get install -y \
-        # Build tools
         build-essential \
-        gcc \
-        g++ \
-        cmake \
-        ninja-build \
-        bison \
-        pkg-config \
-        git \
         ccache \
-        cppcheck \
+        git \
-        wget \
         lsb-release \
+        pkg-config \
         software-properties-common \
-        pipx \
+        xvfb
-        python-is-python3 \
-        python3-jsonschema \
-        ocaml-core \
-        \
-        # Libraries
-        libglm-dev \
-        libpng-dev \
-        libxml2-dev \
-        liblz4-dev \
-        libzstd-dev \
-        libpciaccess0 \
-        \
-        # X11 / XCB
-        libx11-dev \
-        libx11-xcb-dev \
-        libxcb-dri3-0 \
-        libxcb-dri3-dev \
-        libxcb-present0 \
-        libxcb-keysyms1-dev \
-        libxcb-randr0-dev \
-        libxcb-ewmh-dev \
-        \
-        # Wayland
-        libwayland-dev \
-        wayland-protocols \
-        \
-        # Misc display
-        libxrandr-dev \
-        \
-        # Qt
-        qtbase5-dev \
-        qt6-base-dev \
-    && rm -rf /var/lib/apt/lists/*
 
 ENV PATH="/root/.local/bin:${PATH}"
 
-# Install LLVM 20 and symlink tools
+# Install LLVM 22 and symlink tools
 RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
     && chmod +x /tmp/llvm.sh \
-    && /tmp/llvm.sh 20 all \
+    && /tmp/llvm.sh 22 all \
-    && ln -sf /usr/bin/clang-20 /usr/bin/clang \
+    && for f in /usr/lib/llvm-22/bin/*; do \
-    && ln -sf /usr/bin/clang++-20 /usr/bin/clang++ \
+           ln -sf "$f" "/usr/local/bin/$(basename "$f")"; \
-    && ln -sf /usr/bin/llvm-profdata-20 /usr/bin/llvm-profdata \
+       done \
-    && ln -sf /usr/bin/llvm-cov-20 /usr/bin/llvm-cov \
+    && rm -f /tmp/llvm.sh*
-    && ln -sf /usr/bin/clang-format-20 /usr/bin/clang-format \
-    && ln -sf /usr/bin/clang-tidy-20 /usr/bin/clang-tidy \
-    && ln -sf /usr/bin/run-clang-tidy-20 /usr/bin/run-clang-tidy \
-    && ln -sf /usr/bin/llvm-ar-20 /usr/bin/llvm-ar \
-    && ln -sf /usr/bin/llvm-nm-20 /usr/bin/llvm-nm \
-    && ln -sf /usr/bin/llvm-ranlib-20 /usr/bin/llvm-ranlib \
-    && rm -f /tmp/llvm.sh
 
+# Install Infer
 RUN VERSION=1.2.0; \
     curl -sSL "https://github.com/facebook/infer/releases/download/v$VERSION/infer-linux-x86_64-v$VERSION.tar.xz" \
     | tar -C /opt -xJ && \
@@ -82,16 +32,6 @@ RUN VERSION=1.2.0; \
 RUN pipx install conan \
     && pipx install gcovr
 
-# Build and install mold
-RUN git clone --branch v2.40.4 https://github.com/rui314/mold.git /tmp/mold \
-    && cd /tmp/mold \
-    && cmake . -DCMAKE_BUILD_TYPE=Release \
-              -DCMAKE_CXX_COMPILER=clang++ \
-              -B build \
-    && cmake --build build -j$(nproc) \
-    && cmake --install build \
-    && rm -rf /tmp/mold
-
 # Configure Conan with custom profiles and remote
 RUN conan config install https://git.romainboullard.com/BigfootDev/ConanProfiles.git --args="--branch main" \
     && conan remote add bigfootpackages https://conan.romainboullard.com/artifactory/api/conan/BigfootPackages \