diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index b3ade95..8fd248c 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -44,7 +44,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v6 with: - fetch-depth: 0 # fetch full history submodules: recursive - name: Show ccache stats before diff --git a/eastl/all/conanfile.py b/eastl/all/conanfile.py index 81b7043..9e45435 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, Git +from conan.tools.scm import Version required_conan_version = ">=1.52.0" @@ -73,11 +73,8 @@ 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(f"eabase/01082025@bigfootdev/{branch}", transitive_headers=True) + self.requires(f"eabase/01082025@{self.user}/{self.channel}", 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 bafe176..f25d9ef 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, Git +from conan.tools.scm import Version import functools import glob import os @@ -100,13 +100,10 @@ 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(f"{self._require("vulkan-utility-libraries")}/bigfootdev/{branch}", transitive_headers=True) + self.requires(f"{self._require("vulkan-utility-libraries")}/{self.user}/{self.channel}", 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"))