From b4632f67a2909114324321b42fc3f353b52cb97d Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 8 Mar 2023 11:05:04 +0100 Subject: [PATCH 1/2] run gettext with force_host_context Contributes to CURA-10376 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index d6d8f2f468..b5f154e67e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -293,7 +293,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 = "." From c36ea10b086e920633c711c515f9f9a47ac5b860 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 8 Mar 2023 11:28:36 +0100 Subject: [PATCH 2/2] Loop over tags --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 5595fcd278..ea2927daa9 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: