Simplification

Reviewed-on: #2

.gitea/workflows/ci.yaml

@@ -11,7 +11,6 @@ env:
   BASE_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbasebuilder
   CPP_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxcppbuilder
   BIGFOOT_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbigfootbuilder
-  BIGFOOT_COVERAGE_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbigfootcoveragebuilder
 
 jobs:
   build-base-builder:
@@ -76,7 +75,6 @@ jobs:
           tags: ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
           build-args: |
             BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-            CONAN_PROFILE_BRANCH=${{ env.BRANCH_NAME }}
 
   build-bigfoot-builder:
     runs-on: ubuntu-latest
@@ -113,7 +111,6 @@ jobs:
             CONAN_RELEASE_PROFILE=clang
             CONAN_RELWITHDEBINFO_PROFILE=clangd
             CONAN_DEBUG_PROFILE=clangd
-            PACKAGES_CHANNEL=${{ env.BRANCH_NAME_LOWER }}
 
       - name: Push built packages
         env:
@@ -126,41 +123,4 @@ jobs:
           -e CONAN_LOGIN_USERNAME=${ARTIFACTORY_USER} \
           -e CONAN_PASSWORD=${ARTIFACTORY_PASSWORD} \
           ${BIGFOOT_BUILDER_TAG}:${BRANCH_NAME_LOWER} \
-          conan upload '*' --remote=bigfootpackages --force --confirm
-
-  build-bigfootcoverage-builder:
-    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
-          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 bigfootcoverage builder
-        uses: docker/build-push-action@v5
-        with:
-          context: ./Linux/BigfootBuilder
-          push: true
-          tags: ${{ env.BIGFOOT_COVERAGE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-          build-args: |
-            BASE_BUILDER=${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-            CONAN_RELEASE_PROFILE=gcc_coverage
-            CONAN_RELWITHDEBINFO_PROFILE=gcc_coverage
-            CONAN_DEBUG_PROFILE=gcc_coverage
-            PACKAGES_CHANNEL=${{ env.BRANCH_NAME_LOWER }}
+          conan upload '*' --remote=bigfootpackages --force --confirm

Linux/BigfootBuilder/Dockerfile

@@ -5,7 +5,6 @@ FROM $BASE_BUILDER
 ARG CONAN_RELEASE_PROFILE
 ARG CONAN_RELWITHDEBINFO_PROFILE
 ARG CONAN_DEBUG_PROFILE
-ARG PACKAGES_CHANNEL
 
 RUN apt-get update \
     && apt-get install -y \
@@ -28,7 +27,7 @@ RUN apt-get update \
 COPY conanfile.py BigfootDependencies/conanfile.py
 
 RUN ccache --zero-stats \
-    && conan install ./BigfootDependencies -o Requirements/*:packages_channel=${PACKAGES_CHANNEL} --remote=bigfootpackages --build="*" -pr:h=${CONAN_RELEASE_PROFILE} -pr:b=${CONAN_RELEASE_PROFILE} -s build_type=Release \
-    && conan install ./BigfootDependencies -o Requirements/*:packages_channel=${PACKAGES_CHANNEL} --remote=bigfootpackages --build="*" -pr:h=${CONAN_RELWITHDEBINFO_PROFILE} -pr:b=${CONAN_RELWITHDEBINFO_PROFILE} -s build_type=RelWithDebInfo \
-    && conan install ./BigfootDependencies -o Requirements/*:packages_channel=${PACKAGES_CHANNEL} --remote=bigfootpackages --build="*" -pr:h=${CONAN_DEBUG_PROFILE} -pr:b=${CONAN_DEBUG_PROFILE} -s build_type=Debug \
+    && 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

@@ -3,13 +3,6 @@ from conan import ConanFile
 class RequirementsConan(ConanFile):
     name = "Requirements"
 
-    options = {
-        "packages_channel": ["ANY"]
-        }
-    default_options = {
-        "packages_channel": "main"
-        }
-
     def configure(self):
         self.options['mimalloc'].override = True
         self.options['mimalloc'].shared = True
@@ -25,38 +18,38 @@ class RequirementsConan(ConanFile):
         self.options["benchmark"].enable_lto = True
 
     def requirements(self):
-        self.requires(f"eastl/3.27.01@bigfootdev/{self.options.packages_channel}")
-        self.requires(f"unordered_dense/4.8.1@bigfootdev/{self.options.packages_channel}")
-        self.requires(f"mimalloc/3.1.5@bigfootdev/{self.options.packages_channel}")
-        self.requires(f"stduuid/1.2.3@bigfootdev/{self.options.packages_channel}")
-        self.requires(f"sqlite3/3.51.0@bigfootdev/{self.options.packages_channel}")
+        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/{self.options.packages_channel}")
+        self.requires(f"rapidhash/3.0@bigfootdev/main")
         self.requires("effolkronium-random/1.5.0")
-        self.requires(f"flatbuffers/25.12.19@bigfootdev/{self.options.packages_channel}")
+        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/{self.options.packages_channel}")
+        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/{self.options.packages_channel}")
+        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/{self.options.packages_channel}")
+        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/{self.options.packages_channel}")
+        self.requires(f"pixelmatch-cpp17/1.0.3@bigfootdev/main")
 
         self.requires("stb/cci.20240531", override=True)
-        self.requires(f"shaderc/2025.3@bigfootdev/{self.options.packages_channel}")
+        self.requires(f"shaderc/2025.3@bigfootdev/main")
         self.requires("assimp/6.0.2")
-        self.requires(f"meshoptimizer/1.0@bigfootdev/{self.options.packages_channel}")
+        self.requires(f"meshoptimizer/1.0@bigfootdev/main")
         self.requires("libsquish/1.15")
         
         self.requires("benchmark/1.9.4")

Linux/CPPBuilder/Dockerfile

@@ -4,8 +4,6 @@ ARG BASE_BUILDER
 # Base image
 FROM $BASE_BUILDER
 
-ARG CONAN_PROFILE_BRANCH
-
 # Environment variables for ccache and pipx
 ENV CCACHE_DIR=/ccache \
     CCACHE_COMPRESS=1 \
@@ -16,6 +14,7 @@ ENV CCACHE_DIR=/ccache \
 # Install system dependencies, clang, and pipx
 RUN apt-get update && apt-get install -y \
         build-essential \
+        cppcheck \
         ccache \
         cmake \
         ninja-build \
@@ -31,7 +30,6 @@ RUN apt-get update && apt-get install -y \
     && wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
     && chmod +x /tmp/llvm.sh \
     && /tmp/llvm.sh 18 all \
-    && apt-get install -y clang-tools-18 \
     \
     # Symlinks for clang 18 tools
     && ln -sf /usr/bin/clang-18 /usr/bin/clang \
@@ -40,6 +38,7 @@ RUN apt-get update && apt-get install -y \
     && 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 \
@@ -47,6 +46,11 @@ RUN apt-get update && apt-get install -y \
     # Reset ccache stats
     && ccache --zero-stats
 
+RUN VERSION=1.2.0; \
+    curl -sSL "https://github.com/facebook/infer/releases/download/v$VERSION/infer-linux-x86_64-v$VERSION.tar.xz" \
+    | 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 ensurepath \
     && pipx install conan
@@ -65,7 +69,7 @@ RUN git clone --branch v2.40.4 https://github.com/rui314/mold.git /tmp/mold \
     && rm -rf /tmp/mold
 
 # Configure Conan with custom profiles and remote
-RUN conan config install https://git.romainboullard.com/BigfootDev/ConanProfiles.git --args="--branch $CONAN_PROFILE_BRANCH" \
+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