diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index cf7de3f792..786b4c8510 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -132,7 +132,7 @@ jobs: # %% Get the actual version latest_branch_version = Version("0.0.0") latest_branch_tag = None - for tag in repo.git.tag(merged = True).splitlines(): + for tag in repo.active_branch.repo.tags: if str(tag).startswith("firmware") or str(tag).startswith("master"): continue # Quick-fix for the versioning scheme name of the embedded team in fdm_materials(_private) repo try: diff --git a/conanfile.py b/conanfile.py index 44090b6a24..7260edd7c9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -305,7 +305,7 @@ class CuraConan(ConanFile): if self.options.devtools: if self.settings.os != "Windows" or self.conf.get("tools.microsoft.bash:path", check_type = str): # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement - self.tool_requires("gettext/0.21@ultimaker/testing") + self.tool_requires("gettext/0.21@ultimaker/testing", force_host_context = True) def layout(self): self.folders.source = "."