From d0b9cab7db4b887171f34c5bc07d9a934fd730ca Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Thu, 1 Feb 2024 17:13:59 +0100 Subject: [PATCH 1/4] Allign workflows to cura-workflows CURA-11600 --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c21a48e..e94ebf7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -157,7 +157,7 @@ jobs: if: ${{ always() }} needs: [ cura-installer-create ] - uses: ultimaker/cura/.github/workflows/notify.yml@main + uses: ultimaker/cura-workflows/.github/workflows/slack-notify.yml@main with: success: ${{ contains(join(needs.*.result, ','), 'success') }} success_title: "Create the Cura distributions" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 49fee53..816a6d6 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -140,7 +140,7 @@ jobs: if: ${{ always() }} needs: [ cura-installer-create ] - uses: ultimaker/cura/.github/workflows/notify.yml@main + uses: ultimaker/cura-workflows/.github/workflows/slack-notify.yml@main with: success: ${{ contains(join(needs.*.result, ','), 'success') }} success_title: "Create the Cura distributions" diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0fe60f1..4f0173d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -137,7 +137,7 @@ jobs: if: ${{ always() }} needs: [ cura-installer-create ] - uses: ultimaker/cura/.github/workflows/notify.yml@main + uses: ultimaker/cura-workflows/.github/workflows/slack-notify.yml@main with: success: ${{ contains(join(needs.*.result, ','), 'success') }} success_title: "Create the Cura distributions" From c98ff672fee3d894bc96c971b96b2f6939bbeaa4 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Fri, 2 Feb 2024 09:26:47 +0100 Subject: [PATCH 2/4] Aligning the run as curaengine tile CURA-11600 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 968952b..76d53bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,7 @@ jobs: - name: Download the run info uses: actions/download-artifact@v2 with: - name: macos-run-info + name: linux-run-info - name: Set the run info as environment variables run: | @@ -72,7 +72,7 @@ jobs: - name: Download the Cura plugin uses: actions/download-artifact@v2 with: - name: macos-cura-plugin + name: linux-cura-plugin path: cura-plugin - name: Download linux modern binary artifacts From b5c337e3b3cbc33d50969fa5d43cc0ebd5839a12 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Fri, 2 Feb 2024 10:58:50 +0100 Subject: [PATCH 3/4] removed package create because they don't work CURA-11600 --- .github/workflows/conan-package.yml | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index daaead9..8366a77 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -44,28 +44,4 @@ jobs: with: recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} - secrets: inherit - - conan-package-create-macos: - needs: [ conan-recipe-version, conan-package-export ] - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }} - uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-macos.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - secrets: inherit - - conan-package-create-windows: - needs: [ conan-recipe-version, conan-package-export ] - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }} - uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-windows.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - secrets: inherit - - conan-package-create-linux: - needs: [ conan-recipe-version, conan-package-export ] - if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }} - uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - secrets: inherit + secrets: inherit \ No newline at end of file From a34de126a05d43c27198c55aa6263baa369a4f15 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Fri, 2 Feb 2024 11:13:16 +0100 Subject: [PATCH 4/4] for path of bundled package CURA-11600 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76d53bd..9d4dd9a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -109,8 +109,8 @@ jobs: - uses: fieldOfView/cura-plugin-packager-action@main with: - source_folder: "cura-plugin/CuraEngineGradualFlow" - package_info_path: "cura-plugin/CuraEngineGradualFlow/package.json" + source_folder: "cura-plugin/plugins/CuraEngineGradualFlow" + package_info_path: "cura-plugin/plugins/CuraEngineGradualFlow/package.json" - name: Upload the Cura package uses: actions/upload-artifact@v3