BigfootBuilder

2026-01-24 11:02:32 +01:00
parent 3ae222c4bc
commit cb5d500594
3 changed files with 87 additions and 37 deletions
--- a/Linux/BigfootBuilder/Dockerfile
+++ b/Linux/BigfootBuilder/Dockerfile
@@ -5,20 +5,31 @@ FROM $BASE_BUILDER
 ARG CONAN_RELEASE_PROFILE
 ARG CONAN_RELWITHDEBINFO_PROFILE
 ARG CONAN_DEBUG_PROFILE
+ARG ARTIFACTORY_CONAN_USER
+ARG ARTIFACTORY_CONAN_PASSWORD
+ARG PACKAGES_CHANNEL

-RUN wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add 
-RUN wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.4.313-noble.list https://packages.lunarg.com/vulkan/1.4.313/lunarg-vulkan-1.4.313-noble.list
-RUN apt-get update -y
-RUN apt-get install gcovr -y
-RUN apt-get install vulkan-sdk -y
-RUN apt-get install xvfb -y
+RUN apt-get update \
+    && apt-get install -y \
+        gcovr \
+        xvfb \
+    \
+    # LunarG Vulkan repo (modern keyring method)
+    && wget -qO /usr/share/keyrings/lunarg-archive-keyring.gpg https://packages.lunarg.com/lunarg-signing-key-pub.asc; \
+    && 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
-
-RUN CONAN_LOGIN_USERNAME=${GITLAB_CONAN_USER} CONAN_PASSWORD=${GITLAB_CONAN_PASSWORD} conan install ./BigfootDependencies --remote=bigfootpackages --build="*" -pr:h=${CONAN_RELEASE_PROFILE} -pr:b=${CONAN_RELEASE_PROFILE} -s build_type=Release && \
-    CONAN_LOGIN_USERNAME=${GITLAB_CONAN_USER} CONAN_PASSWORD=${GITLAB_CONAN_PASSWORD} conan install ./BigfootDependencies --remote=bigfootpackages --build="*" -pr:h=${CONAN_RELWITHDEBINFO_PROFILE} -pr:b=${CONAN_RELWITHDEBINFO_PROFILE} -s build_type=RelWithDebInfo && \
-    CONAN_LOGIN_USERNAME=${GITLAB_CONAN_USER} CONAN_PASSWORD=${GITLAB_CONAN_PASSWORD} conan install ./BigfootDependencies --remote=bigfootpackages --build="*" -pr:h=${CONAN_DEBUG_PROFILE} -pr:b=${CONAN_DEBUG_PROFILE} -s build_type=Debug
-
-RUN ccache --show-stats
+RUN ccache --zero-stats \
+    && CONAN_LOGIN_USERNAME=${ARTIFACTORY_CONAN_USER} CONAN_PASSWORD=${ARTIFACTORY_CONAN_PASSWORD} 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_LOGIN_USERNAME=${ARTIFACTORY_CONAN_USER} CONAN_PASSWORD=${ARTIFACTORY_CONAN_PASSWORD} 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_LOGIN_USERNAME=${ARTIFACTORY_CONAN_USER} CONAN_PASSWORD=${ARTIFACTORY_CONAN_PASSWORD} 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 \
+    && ccache --show-stats \
+    && CONAN_LOGIN_USERNAME=${ARTIFACTORY_CONAN_USER} CONAN_PASSWORD=${ARTIFACTORY_CONAN_PASSWORD} conan upload "*" --remote=bigfootpackages --force --confirm
--- a/Linux/BigfootBuilder/conanfile.py
+++ b/Linux/BigfootBuilder/conanfile.py
@@ -3,6 +3,13 @@ from conan import ConanFile
 class RequirementsConan(ConanFile):
    name = "Requirements"

+    options = {
+        "packages_channel"
+        }
+    default_options = {
+        "packages_channel": "main"
+        }
+
    def configure(self):
        self.options['stduuid'].with_cxx20_span = True
        self.options['flatbuffers'].header_only = True
@@ -15,17 +22,15 @@ class RequirementsConan(ConanFile):
        self.options["benchmark"].enable_lto = True

    def requirements(self):
-        self.requires("eastl/3.27.01")
-        self.requires("unordered_dense/4.8.1")
-        self.requires("mimalloc/3.1.5")
-        self.requires("magic_enum/0.9.7")
-        self.requires("stduuid/1.2.3")
-        self.requires("sqlite3/3.51.0")
+        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("xxhash/0.8.3")
+        self.requires(f"rapidhash/3.0@bigfootdev/{self.options['packages_channel']}")
        self.requires("effolkronium-random/1.5.0")
-        self.requires("zeus_expected/1.3.0")
-        self.requires("flatbuffers/25.9.23")
+        self.requires(f"flatbuffers/25.12.19@bigfootdev/{self.options['packages_channel']}")

        self.requires("quill/11.0.2")
        self.requires("tracy/0.12.2")
@@ -38,17 +43,17 @@ class RequirementsConan(ConanFile):
        self.requires("glfw/3.4")

        self.requires("vulkan-headers/1.4.313.0")
-        self.requires("vulkan-validationlayers/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("vulkan-memory-allocator/3.3.0")
+        self.requires(f"vulkan-memory-allocator/3.3.0@bigfootdev/{self.options['packages_channel']}")

        self.requires("gtest/1.17.0")
-        self.requires("pixelmatch-cpp17/1.0.3")
+        self.requires(f"pixelmatch-cpp17/1.0.3@bigfootdev/{self.options['packages_channel']}")

        self.requires("stb/cci.20240531", override=True)
-        self.requires("shaderc/2025.3")
+        self.requires(f"shaderc/2025.3@bigfootdev/{self.options['packages_channel']}")
        self.requires("assimp/6.0.2")
-        self.requires("meshoptimizer/1.0")
+        self.requires(f"meshoptimizer/1.0@bigfootdev/{self.options['packages_channel']}")
        self.requires("libsquish/1.15")
        
        self.requires("benchmark/1.9.4")