Skip to content

Commit

Permalink
Merge branch '5.10' into CURA-12359_write-upgrade-script-for-Cura-5.10
Browse files Browse the repository at this point in the history
  • Loading branch information
HellAholic authored Feb 26, 2025
2 parents 58d3e3e + 6833a38 commit 05a5f73
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 10 additions & 10 deletions conandata.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion resources/conandata.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: "5.10.0-alpha.2"
version: "5.10.0-beta.1"

0 comments on commit 05a5f73

Please sign in to comment.