BigfootDev/ConanPackages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GiteaCI #1

Merged
rboullard merged 21 commits from GiteaCI into Development 2026-01-25 23:10:00 +00:00
Conversation 0 Commits 21 Files Changed 4 +10 -4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d91fc83e47 - Show all commits

7
eastl/all/conanfile.py
View File

@@ -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:

7
vulkan-validationlayers/all/conanfile.py
View File

@@ -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"))