From 7b4ff02c498a975da59135bd8e3538b15cedac55 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 29 Jan 2026 20:20:21 +0100 Subject: [PATCH 1/8] Remove GCC Coverage --- .gitea/workflows/ci.yaml | 40 +------------------------------------ Linux/CPPBuilder/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 855f2c7..863f817 100644 --- a/.gitea/workflows/ci.yaml +++ b/.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: @@ -126,41 +125,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 \ No newline at end of file diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile index 071d5f0..92a1061 100644 --- a/Linux/CPPBuilder/Dockerfile +++ b/Linux/CPPBuilder/Dockerfile @@ -31,7 +31,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 +39,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 \ -- 2.49.1 From 4e761aac655a639b48f797d48760c0a1b3dbd103 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 29 Jan 2026 20:24:14 +0100 Subject: [PATCH 2/8] Include Infer --- Linux/CPPBuilder/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile index 92a1061..b747daf 100644 --- a/Linux/CPPBuilder/Dockerfile +++ b/Linux/CPPBuilder/Dockerfile @@ -47,6 +47,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-linux64-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 -- 2.49.1 From b0709db3c1d402f5b27b6733754e8b37168998fd Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 29 Jan 2026 20:26:08 +0100 Subject: [PATCH 3/8] Include CPPCheck --- Linux/CPPBuilder/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile index b747daf..fdd24b6 100644 --- a/Linux/CPPBuilder/Dockerfile +++ b/Linux/CPPBuilder/Dockerfile @@ -16,6 +16,7 @@ ENV CCACHE_DIR=/ccache \ # Install system dependencies, clang, and pipx RUN apt-get update && apt-get install -y \ build-essential \ + cpp-check \ ccache \ cmake \ ninja-build \ -- 2.49.1 From 87dd11e8ec7c4c4b08039996a5a2de3e01a73f06 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 29 Jan 2026 20:32:32 +0100 Subject: [PATCH 4/8] Typo --- Linux/CPPBuilder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile index fdd24b6..3e4fc7f 100644 --- a/Linux/CPPBuilder/Dockerfile +++ b/Linux/CPPBuilder/Dockerfile @@ -16,7 +16,7 @@ ENV CCACHE_DIR=/ccache \ # Install system dependencies, clang, and pipx RUN apt-get update && apt-get install -y \ build-essential \ - cpp-check \ + cppcheck \ ccache \ cmake \ ninja-build \ -- 2.49.1 From 2598ea7d1b49c7820b48da756f4b774475b62b67 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 29 Jan 2026 20:37:54 +0100 Subject: [PATCH 5/8] Fix infer download link --- Linux/CPPBuilder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile index 3e4fc7f..7132366 100644 --- a/Linux/CPPBuilder/Dockerfile +++ b/Linux/CPPBuilder/Dockerfile @@ -49,7 +49,7 @@ RUN apt-get update && apt-get install -y \ && ccache --zero-stats RUN VERSION=1.2.0; \ - curl -sSL "https://github.com/facebook/infer/releases/download/v$VERSION/infer-linux64-v$VERSION.tar.xz" \ + 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 -- 2.49.1 From 4da5f54fa05de5dd4d613212b027584210300bc4 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 29 Jan 2026 21:10:35 +0100 Subject: [PATCH 6/8] fallback packages --- Linux/BigfootBuilder/conanfile.py | 45 ++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/Linux/BigfootBuilder/conanfile.py b/Linux/BigfootBuilder/conanfile.py index 2a43939..abc2969 100644 --- a/Linux/BigfootBuilder/conanfile.py +++ b/Linux/BigfootBuilder/conanfile.py @@ -1,4 +1,5 @@ from conan import ConanFile +from conan.errors import ConanException class RequirementsConan(ConanFile): name = "Requirements" @@ -24,39 +25,57 @@ class RequirementsConan(ConanFile): self.options["benchmark"].enable_exceptions = False self.options["benchmark"].enable_lto = True + def _require_with_fallback(self, pkg_name): + ref = f"{pkg_name}@bigfootdev/{self.options.packages_channel}" + fallback_ref = f"{pkg_name}@bigfootdev/main" + + try: + self.output.info(f"Trying {ref}") + self.requires(ref) + except ConanException: + self.output.warn(f"{ref} not found, falling back to {fallback_ref}") + self.requires(fallback_ref) + 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}") + + bigfoot_packages = [ + "eastl/3.27.01", + "unordered_dense/4.8.1", + "mimalloc/3.1.5", + "stduuid/1.2.3", + "sqlite3/3.51.0", + "rapidhash/3.0", + "flatbuffers/25.12.19", + "lodepng/cci.20250727", + "vulkan-validationlayers/1.4.313.0", + "vulkan-memory-allocator/3.3.0", + "pixelmatch-cpp17/1.0.3", + "shaderc/2025.3", + "meshoptimizer/1.0", + ] + + for pkg in bigfoot_packages: + self._require_with_fallback(pkg) + self.requires("cli11/2.6.0") - self.requires(f"rapidhash/3.0@bigfootdev/{self.options.packages_channel}") self.requires("effolkronium-random/1.5.0") - self.requires(f"flatbuffers/25.12.19@bigfootdev/{self.options.packages_channel}") 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("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("spirv-cross/1.4.313.0") - self.requires(f"vulkan-memory-allocator/3.3.0@bigfootdev/{self.options.packages_channel}") self.requires("gtest/1.17.0") - self.requires(f"pixelmatch-cpp17/1.0.3@bigfootdev/{self.options.packages_channel}") self.requires("stb/cci.20240531", override=True) - self.requires(f"shaderc/2025.3@bigfootdev/{self.options.packages_channel}") self.requires("assimp/6.0.2") - self.requires(f"meshoptimizer/1.0@bigfootdev/{self.options.packages_channel}") self.requires("libsquish/1.15") self.requires("benchmark/1.9.4") -- 2.49.1 From 200ccab096b1eaee0c1e68db499d8273bcd36f5b Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 29 Jan 2026 21:27:06 +0100 Subject: [PATCH 7/8] fallback packages --- .gitea/workflows/ci.yaml | 2 +- Linux/BigfootBuilder/conanfile.py | 45 +++++++++---------------------- 2 files changed, 14 insertions(+), 33 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 863f817..9b66e81 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -112,7 +112,7 @@ jobs: CONAN_RELEASE_PROFILE=clang CONAN_RELWITHDEBINFO_PROFILE=clangd CONAN_DEBUG_PROFILE=clangd - PACKAGES_CHANNEL=${{ env.BRANCH_NAME_LOWER }} + PACKAGES_CHANNEL=${{ env.BRANCH_NAME_LOWER == 'development' || env.BRANCH_NAME_LOWER == 'main' && env.BRANCH_NAME_LOWER || 'main' }} - name: Push built packages env: diff --git a/Linux/BigfootBuilder/conanfile.py b/Linux/BigfootBuilder/conanfile.py index abc2969..2a43939 100644 --- a/Linux/BigfootBuilder/conanfile.py +++ b/Linux/BigfootBuilder/conanfile.py @@ -1,5 +1,4 @@ from conan import ConanFile -from conan.errors import ConanException class RequirementsConan(ConanFile): name = "Requirements" @@ -25,57 +24,39 @@ class RequirementsConan(ConanFile): self.options["benchmark"].enable_exceptions = False self.options["benchmark"].enable_lto = True - def _require_with_fallback(self, pkg_name): - ref = f"{pkg_name}@bigfootdev/{self.options.packages_channel}" - fallback_ref = f"{pkg_name}@bigfootdev/main" - - try: - self.output.info(f"Trying {ref}") - self.requires(ref) - except ConanException: - self.output.warn(f"{ref} not found, falling back to {fallback_ref}") - self.requires(fallback_ref) - def requirements(self): - - bigfoot_packages = [ - "eastl/3.27.01", - "unordered_dense/4.8.1", - "mimalloc/3.1.5", - "stduuid/1.2.3", - "sqlite3/3.51.0", - "rapidhash/3.0", - "flatbuffers/25.12.19", - "lodepng/cci.20250727", - "vulkan-validationlayers/1.4.313.0", - "vulkan-memory-allocator/3.3.0", - "pixelmatch-cpp17/1.0.3", - "shaderc/2025.3", - "meshoptimizer/1.0", - ] - - for pkg in bigfoot_packages: - self._require_with_fallback(pkg) - + 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("cli11/2.6.0") + self.requires(f"rapidhash/3.0@bigfootdev/{self.options.packages_channel}") self.requires("effolkronium-random/1.5.0") + self.requires(f"flatbuffers/25.12.19@bigfootdev/{self.options.packages_channel}") 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("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("spirv-cross/1.4.313.0") + self.requires(f"vulkan-memory-allocator/3.3.0@bigfootdev/{self.options.packages_channel}") self.requires("gtest/1.17.0") + self.requires(f"pixelmatch-cpp17/1.0.3@bigfootdev/{self.options.packages_channel}") self.requires("stb/cci.20240531", override=True) + self.requires(f"shaderc/2025.3@bigfootdev/{self.options.packages_channel}") self.requires("assimp/6.0.2") + self.requires(f"meshoptimizer/1.0@bigfootdev/{self.options.packages_channel}") self.requires("libsquish/1.15") self.requires("benchmark/1.9.4") -- 2.49.1 From 351d07b85f17af670807dd182f75d0ec040c7f63 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 29 Jan 2026 21:45:07 +0100 Subject: [PATCH 8/8] Simplification --- .gitea/workflows/ci.yaml | 2 -- Linux/BigfootBuilder/Dockerfile | 7 +++---- Linux/BigfootBuilder/conanfile.py | 33 ++++++++++++------------------- Linux/CPPBuilder/Dockerfile | 4 +--- 4 files changed, 17 insertions(+), 29 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 9b66e81..77e7114 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -75,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 @@ -112,7 +111,6 @@ jobs: CONAN_RELEASE_PROFILE=clang CONAN_RELWITHDEBINFO_PROFILE=clangd CONAN_DEBUG_PROFILE=clangd - PACKAGES_CHANNEL=${{ env.BRANCH_NAME_LOWER == 'development' || env.BRANCH_NAME_LOWER == 'main' && env.BRANCH_NAME_LOWER || 'main' }} - name: Push built packages env: diff --git a/Linux/BigfootBuilder/Dockerfile b/Linux/BigfootBuilder/Dockerfile index 1768d4a..b493932 100644 --- a/Linux/BigfootBuilder/Dockerfile +++ b/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 \ No newline at end of file diff --git a/Linux/BigfootBuilder/conanfile.py b/Linux/BigfootBuilder/conanfile.py index 2a43939..859d6b4 100644 --- a/Linux/BigfootBuilder/conanfile.py +++ b/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") diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile index 7132366..5496e28 100644 --- a/Linux/CPPBuilder/Dockerfile +++ b/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 \ @@ -71,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 -- 2.49.1