GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-14 13:13:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix translations missing from build...maybe?

Browse Source
This commit is contained in:
Joey de l'Arago 2023-02-22 17:08:58 +01:00
parent 64ecc2118d
commit 2c23221a9a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/conan-package.yml vendored
View File

@ -76,7 +76,7 @@ jobs:
permissions: permissions:
contents: read 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 ] needs: [ conan-recipe-version, conan-package-export ]
uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main

5
conanfile.py
View File

@ -6,7 +6,7 @@ from jinja2 import Template
from conan import ConanFile from conan import ConanFile
from conan.tools.files import copy, rmdir, save, mkdir from conan.tools.files import copy, rmdir, save, mkdir
from conan.tools.microsoft import unix_path 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.tools.scm import Version
from conan.errors import ConanInvalidConfiguration, ConanException from conan.errors import ConanInvalidConfiguration, ConanException
@ -314,6 +314,9 @@ class CuraConan(ConanFile):
vr = VirtualRunEnv(self) vr = VirtualRunEnv(self)
vr.generate() vr.generate()
vb = VirtualBuildEnv(self)
vb.generate()
self._generate_cura_version(Path(self.source_folder, "cura")) self._generate_cura_version(Path(self.source_folder, "cura"))
if self.options.devtools: if self.options.devtools: