From d91fc83e47ad9f4fcb9789b8c02a84cdad797060 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Fri, 23 Jan 2026 23:47:41 +0100 Subject: [PATCH] branch name in packages dependencies when needed --- eastl/all/conanfile.py | 7 +++++-- vulkan-validationlayers/all/conanfile.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/eastl/all/conanfile.py b/eastl/all/conanfile.py index 4be20e1..81b7043 100644 --- a/eastl/all/conanfile.py +++ b/eastl/all/conanfile.py @@ -13,7 +13,7 @@ from conan.tools.files import ( rmdir, ) from conan.tools.microsoft import is_msvc, check_min_vs -from conan.tools.scm import Version +from conan.tools.scm import Version, Git required_conan_version = ">=1.52.0" @@ -73,8 +73,11 @@ class EastlConan(ConanFile): cmake_layout(self, src_folder="src") def requirements(self): + git = Git(self, self.recipe_folder) + branch = git.run("rev-parse --abbrev-ref HEAD").strip().lower() + if self.version >= "3.27.00": - self.requires("eabase/01082025", transitive_headers=True) + self.requires(f"eabase/01082025@bigfootdev/{branch}", transitive_headers=True) elif self.version == "3.21.23": self.requires("eabase/18082024", transitive_headers=True) else: diff --git a/vulkan-validationlayers/all/conanfile.py b/vulkan-validationlayers/all/conanfile.py index 6dc2159..bafe176 100644 --- a/vulkan-validationlayers/all/conanfile.py +++ b/vulkan-validationlayers/all/conanfile.py @@ -6,7 +6,7 @@ from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.env import VirtualBuildEnv from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, mkdir, rename, replace_in_file, rm from conan.tools.gnu import PkgConfigDeps -from conan.tools.scm import Version +from conan.tools.scm import Version, Git import functools import glob import os @@ -100,10 +100,13 @@ class VulkanValidationLayersConan(ConanFile): cmake_layout(self, src_folder="src") def requirements(self): + git = Git(self, self.recipe_folder) + branch = git.run("rev-parse --abbrev-ref HEAD").strip().lower() + self.requires("robin-hood-hashing/3.11.5") self.requires(self._require("spirv-headers")) if Version(conan_version).minor >= "1.4.313": - self.requires(self._require("vulkan-utility-libraries"), transitive_headers=True) + self.requires(f"{self._require("vulkan-utility-libraries")}/bigfootdev/{branch}", transitive_headers=True) if Version(conan_version).major < "2": # TODO: set private=True, once the issue is resolved https://github.com/conan-io/conan/issues/9390 self.requires(self._require("spirv-tools"), private=not hasattr(self, "settings_build"))