From 1f78818000da61f48c841852e80ea7d0a61991e7 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Thu, 29 Jan 2026 21:45:07 +0100 Subject: [PATCH] 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