From 2c23221a9afd28e96e85d6fe95266ef4d881d18a Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 22 Feb 2023 17:08:58 +0100 Subject: [PATCH] Fix translations missing from build...maybe? --- .github/workflows/conan-package.yml | 2 +- conanfile.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index f88f815139..3a32d29a24 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -76,7 +76,7 @@ jobs: permissions: contents: read - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }} + if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch)) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }} needs: [ conan-recipe-version, conan-package-export ] uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main diff --git a/conanfile.py b/conanfile.py index 7dd3c9db9b..c19bbf8029 100644 --- a/conanfile.py +++ b/conanfile.py @@ -6,7 +6,7 @@ from jinja2 import Template from conan import ConanFile from conan.tools.files import copy, rmdir, save, mkdir from conan.tools.microsoft import unix_path -from conan.tools.env import VirtualRunEnv, Environment +from conan.tools.env import VirtualRunEnv, Environment, VirtualBuildEnv from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration, ConanException @@ -314,6 +314,9 @@ class CuraConan(ConanFile): vr = VirtualRunEnv(self) vr.generate() + vb = VirtualBuildEnv(self) + vb.generate() + self._generate_cura_version(Path(self.source_folder, "cura")) if self.options.devtools: