From de1b9c9dba5a7bdc49f56d59f5c0428246fcd423 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Wed, 26 Feb 2025 09:02:42 +0000 Subject: [PATCH 1/2] Set conan package version 5.10.0-beta.1 --- conandata.yml | 14 +++++++------- resources/conandata.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conandata.yml b/conandata.yml index da329eaa98..f0e95ce4cf 100644 --- a/conandata.yml +++ b/conandata.yml @@ -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" + - "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@ultimaker/stable" - "pysavitar/5.10.0@ultimaker/stable" - "pynest2d/5.10.0@ultimaker/stable" 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" diff --git a/resources/conandata.yml b/resources/conandata.yml index dc04def2de..8236ba70b5 100644 --- a/resources/conandata.yml +++ b/resources/conandata.yml @@ -1 +1 @@ -version: "5.10.0-alpha.2" +version: "5.10.0-beta.1" From 6833a38999730b0a56806cc1b9c86a83f08b35b0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 26 Feb 2025 10:55:22 +0100 Subject: [PATCH 2/2] Apply new package name for for release --- .github/workflows/nightly-stable.yml | 2 +- conandata.yml | 6 +++--- conanfile.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml index e166027dd8..1535daa415 100644 --- a/.github/workflows/nightly-stable.yml +++ b/.github/workflows/nightly-stable.yml @@ -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 diff --git a/conandata.yml b/conandata.yml index f0e95ce4cf..9ad6f889b5 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,9 +5,9 @@ requirements: - "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@ultimaker/stable" - - "pysavitar/5.10.0@ultimaker/stable" - - "pynest2d/5.10.0@ultimaker/stable" + - "dulcificum/5.10.0" + - "pysavitar/5.10.0" + - "pynest2d/5.10.0" requirements_internal: - "fdm_materials/5.10.0-beta.1" - "cura_private_data/5.10.0-alpha.0@internal/testing" diff --git a/conanfile.py b/conanfile.py index f7e7cf5d42..0ab118da89 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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],