Simplification

.gitea/workflows/ci.yaml

@@ -10,6 +10,7 @@ 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:
@@ -25,18 +26,22 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Build
-        run: |
-          docker build -t ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} --no-cache ./Linux/BaseBuilder
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: Login to registry
-        run: |
-          echo "${{ secrets.DOCKER_TOKEN }}" | docker login ${{ vars.DOCKER_REGISTRY }} \
-            -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+      - 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: Push
-        run: |
-          docker push ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
+      - name: Build and push base builder
+        uses: docker/build-push-action@v5
+        with:
+          context: ./Linux/BaseBuilder
+          push: true
+          tags: ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
 
   build-cpp-builder:
     runs-on: ubuntu-latest
@@ -52,15 +57,70 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Build
-        run: |
-          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
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: Login to registry
-        run: |
-          echo "${{ secrets.DOCKER_TOKEN }}" | docker login ${{ vars.DOCKER_REGISTRY }} \
-            -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+      - 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: Push
+      - 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 }}
+
+  build-bigfoot-builder:
+    runs-on: ubuntu-latest
+    timeout-minutes: 360
+    needs: build-cpp-builder
+
+    steps:
+      - name: Set ENV
         run: |
-          docker push ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
+          echo "BRANCH_NAME_LOWER=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+          echo "BRANCH_NAME=$(echo $GITHUB_REF_NAME)" >> $GITHUB_ENV
+
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up Docker Buildx
+        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 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
+
+      - name: Push built packages
+        env:
+          ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
+          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          BIGFOOT_BUILDER_TAG: ${{ env.BIGFOOT_BUILDER_TAG }}
+          BRANCH_NAME_LOWER: ${{ env.BRANCH_NAME_LOWER }}
+        run: |
+          docker run --rm \
+          -e CONAN_LOGIN_USERNAME=${ARTIFACTORY_USER} \
+          -e CONAN_PASSWORD=${ARTIFACTORY_PASSWORD} \
+          ${BIGFOOT_BUILDER_TAG}:${BRANCH_NAME_LOWER} \
+          conan upload '*' --remote=bigfootpackages --force --confirm

Linux/BaseBuilder/Dockerfile

@@ -5,12 +5,20 @@ 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 \
-        pipx
+    && rm -rf /var/lib/apt/lists/*

Linux/BigfootBuilder/Dockerfile

@@ -0,0 +1,33 @@
+ARG BASE_BUILDER
+
+FROM $BASE_BUILDER
+
+ARG CONAN_RELEASE_PROFILE
+ARG CONAN_RELWITHDEBINFO_PROFILE
+ARG CONAN_DEBUG_PROFILE
+
+RUN apt-get update \
+    && apt-get install -y \
+        gcovr \
+        xvfb \
+    \
+    # LunarG Vulkan repo (modern keyring method)
+    && wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc \
+      | gpg --dearmor -o /usr/share/keyrings/lunarg-archive-keyring.gpg \
+    \
+    && echo "deb [signed-by=/usr/share/keyrings/lunarg-archive-keyring.gpg] https://packages.lunarg.com/vulkan/1.4.313 noble main" \
+        > /etc/apt/sources.list.d/lunarg-vulkan.list \
+    \
+    && apt-get update \
+    && apt-get install -y vulkan-sdk \
+    \
+    # Cleanup
+    && rm -rf /var/lib/apt/lists/*
+
+COPY conanfile.py BigfootDependencies/conanfile.py
+
+RUN ccache --zero-stats \
+    && conan install ./BigfootDependencies --remote=bigfootpackages --build="*" -pr:h=${CONAN_RELEASE_PROFILE} -pr:b=${CONAN_RELEASE_PROFILE} -s build_type=Release \
+    && conan install ./BigfootDependencies --remote=bigfootpackages --build="*" -pr:h=${CONAN_RELWITHDEBINFO_PROFILE} -pr:b=${CONAN_RELWITHDEBINFO_PROFILE} -s build_type=RelWithDebInfo \
+    && conan install ./BigfootDependencies --remote=bigfootpackages --build="*" -pr:h=${CONAN_DEBUG_PROFILE} -pr:b=${CONAN_DEBUG_PROFILE} -s build_type=Debug \
+    && ccache --show-stats

Linux/BigfootBuilder/conanfile.py

@@ -0,0 +1,56 @@
+from conan import ConanFile
+
+class RequirementsConan(ConanFile):
+    name = "Requirements"
+
+    def configure(self):
+        self.options['mimalloc'].override = True
+        self.options['mimalloc'].shared = True
+    
+        self.options['stduuid'].with_cxx20_span = True
+        self.options['flatbuffers'].header_only = True
+
+        self.options["tracy"].on_demand = True
+
+        self.options["spirv-cross"].exceptions = False
+
+        self.options["benchmark"].enable_exceptions = False
+        self.options["benchmark"].enable_lto = True
+
+    def requirements(self):
+        self.requires(f"eastl/3.27.01@bigfootdev/main")
+        self.requires(f"unordered_dense/4.8.1@bigfootdev/main")
+        self.requires(f"mimalloc/3.1.5@bigfootdev/main")
+        self.requires(f"stduuid/1.2.3@bigfootdev/main")
+        self.requires(f"sqlite3/3.51.0@bigfootdev/main")
+        self.requires("cli11/2.6.0")
+        self.requires(f"rapidhash/3.0@bigfootdev/main")
+        self.requires("effolkronium-random/1.5.0")
+        self.requires(f"flatbuffers/25.12.19@bigfootdev/main")
+
+        self.requires("quill/11.0.2")
+        self.requires("tracy/0.12.2")
+        self.requires("cpptrace/1.0.4")
+
+        self.requires("glm/1.0.1")
+        self.requires(f"lodepng/cci.20250727@bigfootdev/main")
+        self.requires("imgui/1.92.5-docking")
+
+        self.requires("glfw/3.4")
+
+        self.requires("vulkan-headers/1.4.313.0")
+        self.requires(f"vulkan-validationlayers/1.4.313.0@bigfootdev/main")
+        self.requires("spirv-cross/1.4.313.0")
+        self.requires(f"vulkan-memory-allocator/3.3.0@bigfootdev/main")
+
+        self.requires("gtest/1.17.0")
+        self.requires(f"pixelmatch-cpp17/1.0.3@bigfootdev/main")
+
+        self.requires("stb/cci.20240531", override=True)
+        self.requires(f"shaderc/2025.3@bigfootdev/main")
+        self.requires("assimp/6.0.2")
+        self.requires(f"meshoptimizer/1.0@bigfootdev/main")
+        self.requires("libsquish/1.15")
+        
+        self.requires("benchmark/1.9.4")
+        

Linux/CPPBuilder/Dockerfile

@@ -1,52 +1,77 @@
+# Build arguments
 ARG BASE_BUILDER
 
+# Base image
 FROM $BASE_BUILDER
 
+# Environment variables for ccache and pipx
+ENV CCACHE_DIR=/ccache \
+    CCACHE_COMPRESS=1 \
+    CCACHE_MAXSIZE=10G \
+    CCACHE_COMPILERCHECK=content \
+    PATH=/root/.local/bin:$PATH
+
+# Install system dependencies, clang, and pipx
 RUN apt-get update && apt-get install -y \
         build-essential \
+        cppcheck \
         ccache \
+        cmake \
+        ninja-build \
         git \
-        lsb-release \
         pkg-config \
+        wget \
+        lsb-release \
         software-properties-common \
-        xvfb
-
-ENV PATH="/root/.local/bin:${PATH}"
-
-# Install LLVM 22 and symlink tools
-RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
+        pipx \
+    && rm -rf /var/lib/apt/lists/* \
+    \
+    # Install LLVM 18
+    && wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
     && chmod +x /tmp/llvm.sh \
-    && /tmp/llvm.sh 22 all \
-    && for f in /usr/lib/llvm-22/bin/*; do \
-           ln -sf "$f" "/usr/local/bin/$(basename "$f")"; \
-       done \
-    && rm -f /tmp/llvm.sh*
+    && /tmp/llvm.sh 18 all \
+    \
+    # Symlinks for clang 18 tools
+    && ln -sf /usr/bin/clang-18 /usr/bin/clang \
+    && ln -sf /usr/bin/clang++-18 /usr/bin/clang++ \
+    && ln -sf /usr/bin/llvm-profdata-18 /usr/bin/llvm-profdata \
+    && ln -sf /usr/bin/llvm-cov-18 /usr/bin/llvm-cov \
+    && ln -sf /usr/bin/clang-format-18 /usr/bin/clang-format \
+    && ln -sf /usr/bin/clang-tidy-18 /usr/bin/clang-tidy \
+    && ln -sf /usr/bin/run-clang-tidy-18 /usr/bin/run-clang-tidy \
+    && ln -sf /usr/bin/llvm-ar-18 /usr/bin/llvm-ar \
+    && ln -sf /usr/bin/llvm-nm-18 /usr/bin/llvm-nm \
+    && ln -sf /usr/bin/llvm-ranlib-18 /usr/bin/llvm-ranlib \
+    \
+    # Reset ccache stats
+    && ccache --zero-stats
 
-# 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 && \
-    ln -s "/opt/infer-linux-x86_64-v$VERSION/bin/infer" /usr/bin/infer
+    | sudo tar -C /opt -xJ && \
+    sudo ln -s "/opt/infer-linux64-v$VERSION/bin/infer" /usr/local/bin/infer
 
 # Install pipx and Conan
-RUN pipx install conan \
-    && pipx install gcovr
+RUN pipx ensurepath \
+    && pipx install conan
+
+# Build and install mold
+RUN git clone --branch v2.40.4 https://github.com/rui314/mold.git /tmp/mold \
+    && cd /tmp/mold \
+    && ./install-build-deps.sh \
+    && cmake . -DCMAKE_BUILD_TYPE=Release \
+              -DCMAKE_CXX_COMPILER=clang++ \
+              -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+              -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+              -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 \
     && conan remote disable conancenter
 
-# Install Vulkan SDK 1.4.341.0
-RUN wget -q https://sdk.lunarg.com/sdk/download/1.4.341.0/linux/vulkansdk-linux-x86_64-1.4.341.0.tar.xz \
-        -O /tmp/vulkansdk.tar.xz \
-    && mkdir -p /opt/vulkan \
-    && tar -xf /tmp/vulkansdk.tar.xz -C /opt/vulkan \
-    && rm /tmp/vulkansdk.tar.xz
-
-ENV VULKAN_SDK=/opt/vulkan/1.4.341.0/x86_64
-ENV PATH="${VULKAN_SDK}/bin:${PATH}"
-ENV LD_LIBRARY_PATH="${VULKAN_SDK}/lib:${LD_LIBRARY_PATH}"
-ENV VK_LAYER_PATH="${VULKAN_SDK}/share/vulkan/explicit_layer.d"
-ENV VK_ADD_LAYER_PATH="${VULKAN_SDK}/share/vulkan/explicit_layer.d"
-ENV PKG_CONFIG_PATH="${VULKAN_SDK}/lib/pkgconfig/:${PKG_CONFIG_PATH}"
+# Show ccache stats (optional, for debugging)
+RUN ccache --show-stats