Browse Source

Use different action to dispatch package creation

Erwan MATHIEU 9 months ago
parent
commit
d3e10aff83
1 changed files with 30 additions and 15 deletions
  1. 30 15
      .github/workflows/release-process_release-candidate.yml

+ 30 - 15
.github/workflows/release-process_release-candidate.yml

@@ -101,17 +101,15 @@ jobs:
             conan_recipe_root: "resources"
     steps:
       - name: Call external create package
-        uses: mathze/workflow-dispatch-action@v1.3.0
+        id: dispatch-create-action
+        uses: Codex-/return-dispatch@v1.14.0
         with:
           owner: Ultimaker
           repo: Cura-workflows
-          workflow-name: conan-package-release.yml
-          ref: CURA-10769_automate_release_action
           token: ${{ secrets.CURA_AUTORELEASE_PAT }}
-          fail-on-error: true
-          wait-timeout: 60m
-          run-id: dummy-run-id
-          payload: |
+          workflow: conan-package-release.yml
+          ref: CURA-10769_automate_release_action
+          workflow_inputs: |
             {
               "repository": "${{ matrix.repository }}",
               "ref_name": "${{ needs.parse-version.outputs.branch_name }}",
@@ -123,23 +121,30 @@ jobs:
               "conan_recipe_root": "${{ matrix.conan_recipe_root }}"
             }
 
+      - name: Wait for package creation completion
+        uses: Codex-/await-remote-run@v1.12.2
+        with:
+          owner: Ultimaker
+          repo: Cura-workflows
+          token: ${{ secrets.CURA_AUTORELEASE_PAT }}
+          run_id: ${{ steps.dispatch-create-action.outputs.run_id }}
+          run_timeout_seconds: 1800
+
   create-cura-package:
     name: Create conan packages for Cura
     runs-on: ubuntu-latest
     needs: [parse-version, create-dependencies-packages]
     steps:
       - name: Call external create package
-        uses: mathze/workflow-dispatch-action@v1.3.0
+        id: dispatch-create-action
+        uses: Codex-/return-dispatch@v1.14.0
         with:
           owner: Ultimaker
           repo: Cura-workflows
-          workflow-name: conan-package-release.yml
-          ref: CURA-10769_automate_release_action
           token: ${{ secrets.CURA_AUTORELEASE_PAT }}
-          fail-on-error: true
-          wait-timeout: 60m
-          run-id: dummy-run-id
-          payload: |
+          workflow: conan-package-release.yml
+          ref: CURA-10769_automate_release_action
+          workflow_inputs: |
             {
               "repository": "Cura",
               "ref_name": "${{ needs.parse-version.outputs.branch_name }}",
@@ -147,9 +152,19 @@ jobs:
               "conan_release": "true",
               "conan_user_channel": "ultimaker/stable",
               "conan_internal": "false",
-              "conan_latest": "true"
+              "conan_latest": "true",
+              "conan_recipe_root": "${{ matrix.conan_recipe_root }}"
             }
 
+      - name: Wait for package creation completion
+        uses: Codex-/await-remote-run@v1.12.2
+        with:
+          owner: Ultimaker
+          repo: Cura-workflows
+          token: ${{ secrets.CURA_AUTORELEASE_PAT }}
+          run_id: ${{ steps.dispatch-create-action.outputs.run_id }}
+          run_timeout_seconds: 3600
+
   create-installers:
     name: Create installers
     uses: ./.github/workflows/installers.yml