Skip to content
This repository has been archived by the owner on Aug 22, 2024. It is now read-only.

Commit

Permalink
Merge pull request #15 from Ultimaker/CURA-11600-Allign-workflows-to-…
Browse files Browse the repository at this point in the history
…cura-workflows

Allign workflows to cura-workflows
  • Loading branch information
wawanbreton authored Feb 6, 2024
2 parents 3bd0f85 + a34de12 commit 842a302
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 32 deletions.
26 changes: 1 addition & 25 deletions .github/workflows/conan-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 842a302

Please sign in to comment.