Merge branch '5.10' into CURA-12359_write-upgrade-script-for-Cura-5.10

This commit is contained in:
HellAholic 2025-02-26 11:09:06 +01:00 committed by GitHub
commit 05a5f73167
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 13 deletions

View File

@ -10,7 +10,7 @@ jobs:
build-nightly:
uses: ./.github/workflows/nightly.yml
with:
cura_conan_version: "cura/[*]@ultimaker/stable"
cura_conan_version: "cura/[*]"
release_tag: "nightly-stable"
caller_workflow: "nightly-stable.yml"
secrets: inherit

View File

@ -1,15 +1,15 @@
version: "5.10.0-alpha.2"
version: "5.10.0-beta.1"
requirements:
- "cura_resources/5.10.0-alpha.2"
- "uranium/5.10.0-alpha.2"
- "curaengine/5.10.0-alpha.2"
- "cura_binary_data/5.10.0-alpha.2"
- "fdm_materials/5.10.0-alpha.2"
- "dulcificum/5.10.0@ultimaker/stable"
- "pysavitar/5.10.0@ultimaker/stable"
- "pynest2d/5.10.0@ultimaker/stable"
- "cura_resources/5.10.0-beta.1"
- "uranium/5.10.0-beta.1"
- "curaengine/5.10.0-beta.1"
- "cura_binary_data/5.10.0-beta.1"
- "fdm_materials/5.10.0-beta.1"
- "dulcificum/5.10.0"
- "pysavitar/5.10.0"
- "pynest2d/5.10.0"
requirements_internal:
- "fdm_materials/5.10.0-alpha.2"
- "fdm_materials/5.10.0-beta.1"
- "cura_private_data/5.10.0-alpha.0@internal/testing"
requirements_enterprise:
- "native_cad_plugin/2.0.0"

View File

@ -33,7 +33,7 @@ class CuraConan(ConanFile):
generators = "VirtualPythonEnv"
tool_requires = "gettext/0.22.5"
python_requires = "translationextractor/[>=2.2.0]@ultimaker/stable"
python_requires = "translationextractor/[>=2.2.0]"
options = {
"enterprise": [True, False],

View File

@ -1 +1 @@
version: "5.10.0-alpha.2"
version: "5.10.0-beta.1"