From 41526bfe7018865a179d36e719ae67b676e9570f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 4 Dec 2024 15:01:15 +0100 Subject: [PATCH] Prepare for merge CURA-11622 --- .github/workflows/conan-package-resources.yml | 3 +- .github/workflows/conan-package.yml | 3 +- .github/workflows/installers.yml | 7 ++-- .github/workflows/linux.yml | 3 +- .github/workflows/macos.yml | 3 +- .github/workflows/nightly-stable.yml | 6 ++-- .github/workflows/nightly-testing.yml | 6 ++-- .github/workflows/nightly.yml | 6 ++-- .../notify_on_print_profile_change.yml | 36 ------------------- .github/workflows/printer-linter-format.yml | 16 ++------- .../workflows/printer-linter-pr-diagnose.yml | 18 ++-------- .../release-process_feature-freeze.yml | 3 +- .../release-process_release-candidate.yml | 11 +++--- .github/workflows/unit-test.yml | 3 +- .github/workflows/update-translation.yml | 3 +- .github/workflows/windows.yml | 3 +- conandata.yml | 18 +++++----- resources/conanfile.py | 4 --- 18 files changed, 34 insertions(+), 118 deletions(-) delete mode 100644 .github/workflows/notify_on_print_profile_change.yml diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index dbc2558a43..3a56e61a9c 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -21,9 +21,8 @@ on: - '[0-9].[0-9][0-9]*' jobs: -# FIXME: Use main once merged conan-package: - uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main with: conan_recipe_root: "./resources/" platform_windows: false diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 961052d69f..55123dc374 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -33,7 +33,6 @@ on: - '[0-9].[0-9][0-9]*' jobs: -# FIXME: Use main once merged conan-package: - uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main secrets: inherit diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index f19af8a745..3ce0aec312 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -24,12 +24,11 @@ on: jobs: installers: -# FIXME: Use main once merged name: Create installers - uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise == 'true' }} - staging: ${{ inputs.staging == 'true' }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} secrets: inherit diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6d428a8cc9..f4d5052c0d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,9 +34,8 @@ on: - self-hosted-Ubuntu22-X64 jobs: -# FIXME: Use main once merged linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 12f58616ae..ffc9b27b8b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -43,9 +43,8 @@ on: - macos-12 jobs: -# FIXME: Use main once merged macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml index d8e1754fcf..02cb71195d 100644 --- a/.github/workflows/nightly-stable.yml +++ b/.github/workflows/nightly-stable.yml @@ -8,10 +8,8 @@ on: jobs: build-nightly: -# FIXME: Use main once merged - uses: ultimaker/cura/.github/workflows/nightly.yml@CURA-11622_conan_v2 + uses: ./.github/workflows/nightly.yml with: -# FIXME: Use stable channel once merged - cura_conan_version: "cura/[*]@ultimaker/cura_11622" + cura_conan_version: "cura/[*]@ultimaker/stable" release_tag: "nightly" caller_workflow: "nightly-stable.yml" diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml index 0d66c17e20..207634d81c 100644 --- a/.github/workflows/nightly-testing.yml +++ b/.github/workflows/nightly-testing.yml @@ -8,10 +8,8 @@ on: jobs: build-nightly: -# FIXME: Use main once merged - uses: ultimaker/cura/.github/workflows/nightly.yml@CURA-11622_conan_v2 + uses: ./.github/workflows/nightly.yml with: -# FIXME: Use testing channel once merged - cura_conan_version: "cura/[*]@ultimaker/cura_11622" + cura_conan_version: "cura/[*]@ultimaker/testing" release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever caller_workflow: "nightly-testing.yml" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4b7403b7e9..933b7210b6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -19,8 +19,7 @@ jobs: create-installers: name: Create installers id: create-installers -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} secrets: inherit @@ -31,8 +30,7 @@ jobs: needs: [ create-installers ] steps: - name: Setup the build environment -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - name: Download installers jobs artifacts uses: actions/download-artifact@v4 diff --git a/.github/workflows/notify_on_print_profile_change.yml b/.github/workflows/notify_on_print_profile_change.yml deleted file mode 100644 index c8747a9828..0000000000 --- a/.github/workflows/notify_on_print_profile_change.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: notify_on_print_profile_change - -on: - push: - branches: [ "main" ] - paths: - - 'resources/definitions/fdmprinter.def.json' - - 'resources/definitions/ultimaker**' - - 'resources/extruders/ultimaker**' - - 'resources/intent/ultimaker**' - - 'resources/quality/ultimaker**' - - 'resources/variants/ultimaker**' - pull_request: - branches: [ "main" ] - paths: - - 'resources/definitions/fdmprinter.def.json' - - 'resources/definitions/ultimaker**' - - 'resources/extruders/ultimaker**' - - 'resources/intent/ultimaker**' - - 'resources/quality/ultimaker**' - - 'resources/variants/ultimaker**' -permissions: {} -jobs: - slackNotification: - name: Slack Notification - runs-on: ubuntu-latest - steps: - - name: Ultimaker Print Profile Changed - uses: rtCamp/action-slack-notify@v2 - env: - SLACK_CHANNEL: profile-changes - SLACK_USERNAME: ${{ github.repository }} - SLACK_COLOR: '#00FF00' - SLACK_TITLE: Print profiles changed - MSG_MINIMAL: commit - SLACK_WEBHOOK: ${{ secrets.SLACK_CURA_PPM_HOOK }} \ No newline at end of file diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 07ba8bb989..9e208f46a4 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -15,8 +15,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 + - name: Setup the build environment + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - uses: greguintow/get-diff-action@v7 with: @@ -24,18 +24,6 @@ jobs: resources/+(definitions|extruders)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg - - name: Setup Python and pip - if: env.GIT_DIFF && !env.MATCHED_FILES # If nothing happens with python and/or pip after, the clean-up crashes. - uses: actions/setup-python@v5 - with: - python-version: 3.11.x - cache: 'pip' - cache-dependency-path: .github/workflows/requirements-printer-linter.txt - - - name: Install Python requirements for runner - if: env.GIT_DIFF && !env.MATCHED_FILES - run: pip install -r .github/workflows/requirements-printer-linter.txt - - name: Format file if: env.GIT_DIFF && !env.MATCHED_FILES run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }} diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index 106c9123e6..8feecdb3ee 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -14,10 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 2 + - name: Setup the build environment + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - uses: greguintow/get-diff-action@v7 with: @@ -26,18 +24,6 @@ jobs: resources/+(extruders|definitions)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg - - name: Setup Python and pip - if: env.GIT_DIFF && !env.MATCHED_FILES # If nothing happens with python and/or pip after, the clean-up crashes. - uses: actions/setup-python@v5 - with: - python-version: 3.11.x - cache: "pip" - cache-dependency-path: .github/workflows/requirements-printer-linter.txt - - - name: Install Python requirements for runner - if: env.GIT_DIFF && !env.MATCHED_FILES - run: pip install -r .github/workflows/requirements-printer-linter.txt - - name: Create results directory run: mkdir printer-linter-result diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index 07242790ce..de15d5c310 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -25,8 +25,7 @@ jobs: feature-freeze: name: Process feature freeze -# FIXME: Use main once merged - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-11622_conan_v2 + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index caa132c830..b4454d5fef 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -32,8 +32,7 @@ jobs: freeze-packages-versions: name: Freeze packges versions -# FIXME: Use main once merged - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-11622_conan_v2 + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main needs: [parse-version] with: cura_version: ${{ inputs.cura_version }} @@ -103,8 +102,7 @@ jobs: create-packages: name: Create conan packages -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main needs: [parse-version, freeze-packages-versions] strategy: matrix: @@ -114,15 +112,14 @@ jobs: - repository: Cura conan_recipe_root: "resources" with: - repository: Ultimaker/${{ matrix.repository }} + repository: ${{ matrix.repository }} branch: ${{ needs.parse-version.outputs.branch_name }} conan_recipe_root: ${{ matrix.conan_recipe_root }} secrets: inherit create-installers: name: Create installers -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main needs: [parse-version, create-packages] with: cura_conan_version: cura/${{ inputs.cura_version }}@ultimaker/stable diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index fb997464d1..4761a32907 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -40,7 +40,6 @@ on: jobs: testing: name: Run unit tests -# FIXME: use main once merged - uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@main with: test_use_pytest: true diff --git a/.github/workflows/update-translation.yml b/.github/workflows/update-translation.yml index aa897e5e2c..189390410b 100644 --- a/.github/workflows/update-translation.yml +++ b/.github/workflows/update-translation.yml @@ -10,7 +10,6 @@ on: jobs: update-translations: -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/update-translations.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/update-translations.yml@main with: branch: ${{ inputs.branch }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2ff8dffe91..bdfc92e5ab 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -35,8 +35,7 @@ on: jobs: windows-installer: - # FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/conandata.yml b/conandata.yml index b07b5b1078..02f044423f 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,16 +1,16 @@ version: "5.10.0-alpha.0" requirements: - - "cura_resources/5.10.0-alpha.0@ultimaker/cura_11622" - - "uranium/5.10.0-alpha.0@ultimaker/cura_11622" - - "curaengine/5.10.0-alpha.0@ultimaker/cura_11622" - - "cura_binary_data/5.10.0-alpha.0@ultimaker/cura_11622" - - "fdm_materials/5.10.0-alpha.0@ultimaker/cura_11622" - - "dulcificum/0.2.1@ultimaker/cura_11622" - - "pysavitar/5.4.0-alpha.0@ultimaker/cura_11622" - - "pynest2d/5.4.0-alpha.0@ultimaker/cura_11622" + - "cura_resources/5.10.0-alpha.0@ultimaker/testing" + - "uranium/5.10.0-alpha.0@ultimaker/testing" + - "curaengine/5.10.0-alpha.0@ultimaker/testing" + - "cura_binary_data/5.10.0-alpha.0@ultimaker/testing" + - "fdm_materials/5.10.0-alpha.0@ultimaker/testing" + - "dulcificum/0.2.1@ultimaker/stable" + - "pysavitar/5.4.0-alpha.0@ultimaker/stable" + - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - "fdm_materials/5.8.1" - - "cura_private_data/5.10.0-alpha.0@internal/cura_11622" + - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: diff --git a/resources/conanfile.py b/resources/conanfile.py index 4f2e9af467..aea89f4569 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -36,10 +36,6 @@ class CuraResource(ConanFile): copy(self, pattern="*", src=os.path.join(self.recipe_folder, shared_resources), dst=os.path.join(self.export_sources_folder, shared_resources)) - def validate(self): - if Version(self.version) <= Version("4"): - raise ConanInvalidConfiguration("Only versions 5+ are support") - def layout(self): self.cpp.source.resdirs = self._shared_resources self.cpp.package.resdirs = [f"res/{res}" for res in self._shared_resources]