Prepare for merge

CURA-11622
2025-07-31 11:11:58 +08:00 · 2024-12-04 15:01:15 +01:00 · 2024-12-04 15:01:15 +01:00 · 41526bfe70
commit 41526bfe70
parent e2487377cc
18 changed files with 34 additions and 118 deletions
--- 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
--- 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
--- 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
--- 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 }}
--- 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 }}
--- 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"
--- 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"
--- 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
--- a/.github/workflows/notify_on_print_profile_change.yml
+++ b/.github/workflows/notify_on_print_profile_change.yml
@ -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 }}
--- 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 }}
--- 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

--- 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 }}
--- 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
--- 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
--- 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 }}
--- 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 }}
--- 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:
--- 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]