branch name in packages dependencies when needed
Some checks failed
Conan Packaging / conan-packages (map[location:all name:eastl needs_pkg:eabase version:3.27.01]) (push) Failing after 7s
Conan Packaging / conan-packages (map[location:all name:mimalloc needs_pkg: version:3.1.5]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:eabase needs_pkg: version:01082025]) (push) Successful in 12s
Conan Packaging / conan-packages (map[location:all name:flatbuffers needs_pkg: version:25.12.19]) (push) Successful in 1m0s
Conan Packaging / conan-packages (map[location:all name:lodepng needs_pkg: version:cci.20250727]) (push) Successful in 13s
Conan Packaging / conan-packages (map[location:all name:meshoptimizer needs_pkg: version:1.0]) (push) Successful in 13s
Conan Packaging / conan-packages (map[location:all name:pixelmatch-cpp17 needs_pkg: version:1.0.3]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:rapidhash needs_pkg: version:3.0]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:shaderc needs_pkg: version:2025.3]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:sqlite3 needs_pkg: version:3.51.0]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:stduuid needs_pkg: version:1.2.3]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:unordered_dense needs_pkg: version:4.8.1]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:vulkan-memory-allocator needs_pkg: version:3.3.0]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:vulkan-utility-libraries needs_pkg: version:1.4.313.0]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:vulkan-validationlayers needs_pkg:vulkan-utility-libraries version:1.4.313.0]) (push) Has been cancelled
Some checks failed
Conan Packaging / conan-packages (map[location:all name:eastl needs_pkg:eabase version:3.27.01]) (push) Failing after 7s
Conan Packaging / conan-packages (map[location:all name:mimalloc needs_pkg: version:3.1.5]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:eabase needs_pkg: version:01082025]) (push) Successful in 12s
Conan Packaging / conan-packages (map[location:all name:flatbuffers needs_pkg: version:25.12.19]) (push) Successful in 1m0s
Conan Packaging / conan-packages (map[location:all name:lodepng needs_pkg: version:cci.20250727]) (push) Successful in 13s
Conan Packaging / conan-packages (map[location:all name:meshoptimizer needs_pkg: version:1.0]) (push) Successful in 13s
Conan Packaging / conan-packages (map[location:all name:pixelmatch-cpp17 needs_pkg: version:1.0.3]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:rapidhash needs_pkg: version:3.0]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:shaderc needs_pkg: version:2025.3]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:sqlite3 needs_pkg: version:3.51.0]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:stduuid needs_pkg: version:1.2.3]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:unordered_dense needs_pkg: version:4.8.1]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:vulkan-memory-allocator needs_pkg: version:3.3.0]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:vulkan-utility-libraries needs_pkg: version:1.4.313.0]) (push) Has been cancelled
Conan Packaging / conan-packages (map[location:all name:vulkan-validationlayers needs_pkg:vulkan-utility-libraries version:1.4.313.0]) (push) Has been cancelled
This commit is contained in:
@@ -13,7 +13,7 @@ from conan.tools.files import (
|
|||||||
rmdir,
|
rmdir,
|
||||||
)
|
)
|
||||||
from conan.tools.microsoft import is_msvc, check_min_vs
|
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"
|
required_conan_version = ">=1.52.0"
|
||||||
|
|
||||||
@@ -73,8 +73,11 @@ class EastlConan(ConanFile):
|
|||||||
cmake_layout(self, src_folder="src")
|
cmake_layout(self, src_folder="src")
|
||||||
|
|
||||||
def requirements(self):
|
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":
|
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":
|
elif self.version == "3.21.23":
|
||||||
self.requires("eabase/18082024", transitive_headers=True)
|
self.requires("eabase/18082024", transitive_headers=True)
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
|
|||||||
from conan.tools.env import VirtualBuildEnv
|
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.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.gnu import PkgConfigDeps
|
||||||
from conan.tools.scm import Version
|
from conan.tools.scm import Version, Git
|
||||||
import functools
|
import functools
|
||||||
import glob
|
import glob
|
||||||
import os
|
import os
|
||||||
@@ -100,10 +100,13 @@ class VulkanValidationLayersConan(ConanFile):
|
|||||||
cmake_layout(self, src_folder="src")
|
cmake_layout(self, src_folder="src")
|
||||||
|
|
||||||
def requirements(self):
|
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("robin-hood-hashing/3.11.5")
|
||||||
self.requires(self._require("spirv-headers"))
|
self.requires(self._require("spirv-headers"))
|
||||||
if Version(conan_version).minor >= "1.4.313":
|
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":
|
if Version(conan_version).major < "2":
|
||||||
# TODO: set private=True, once the issue is resolved https://github.com/conan-io/conan/issues/9390
|
# 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"))
|
self.requires(self._require("spirv-tools"), private=not hasattr(self, "settings_build"))
|
||||||
|
|||||||
Reference in New Issue
Block a user