ci: fix auto-release process race condition (#348)

hyperledger · Feb 6, 2023 · e40bcbe · e40bcbe
1 parent 02d559e
commit e40bcbe
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 21 deletions.
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -3,11 +3,15 @@ name: Deployment
 # Trigger deployment when a new tag is pushed
 # to a service component
 on:
-  push:
-    tags:
-      - prism-agent-*
-      - iris-service-*
-      - mercury-mediator-*
+  workflow_call:
+    inputs:
+      component-tag:
+        required: true
+        type: string
+      env:
+        required: false
+        type: string
+        default: "dev"
   workflow_dispatch:
     inputs:
       component-tag:
@@ -26,11 +30,11 @@ jobs:
         id: parse-params
         run: |
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            echo "COMPONENT_TAG=${{ github.event.inputs.component-tag }}" >> $GITHUB_OUTPUT
-            echo "ENV=${{ github.event.inputs.env }}" >> $GITHUB_OUTPUT
+            echo "COMPONENT_TAG=${{ github.event.inputs.component-tag }}" >> "${GITHUB_OUTPUT}"
+            echo "ENV=${{ github.event.inputs.env }}" >> "${GITHUB_OUTPUT}"
           else
-            echo "COMPONENT_TAG=${{ github.ref_name}}" >> $GITHUB_OUTPUT
-            echo "ENV=dev" >> $GITHUB_OUTPUT
+            echo "COMPONENT_TAG=${{ inputs.component-tag }}" >> "${GITHUB_OUTPUT}"
+            echo "ENV=${{ inputs.env }}" >> "${GITHUB_OUTPUT}"
           fi
       - name: Trigger deployment
         uses: peter-evans/repository-dispatch@v2

diff --git a/.github/workflows/prism-agent.yml b/.github/workflows/prism-agent.yml
@@ -4,7 +4,6 @@ name: Prism agent testing workflow
 # this will help to push fixes earlier and stop previous workflows
 concurrency:
   group: ${{ github.head_ref }}${{ github.ref }}-prism-agent
-  cancel-in-progress: true
 
 on:
   push:
@@ -28,8 +27,15 @@ jobs:
       component-dir: "prism-agent/service"
     secrets: inherit
   release:
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' && !contains(github.event.head_commit.message, 'chore(release)')
     uses: ./.github/workflows/release.yml
     with:
       release-component: "prism-agent/service"
     secrets: inherit
+  deploy:
+    if: github.event_name == 'push' && contains(github.event.head_commit.message, 'chore(release)')
+    uses: ./.github/workflows/deployment.yml
+    with:
+      component-tag: "${{ github.ref_name }}"
+      env: "dev"
+    secrets: inherit
diff --git a/castor/lib/package.json b/castor/lib/package.json
@@ -32,7 +32,7 @@
         [
           "@semantic-release/exec",
           {
-            "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+            "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
           }
         ],
         [

diff --git a/connect/lib/package.json b/connect/lib/package.json
@@ -32,7 +32,7 @@
         [
           "@semantic-release/exec",
           {
-            "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+            "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
           }
         ],
         [

diff --git a/iris/client/scala-client/package.json b/iris/client/scala-client/package.json
@@ -32,7 +32,7 @@
         [
           "@semantic-release/exec",
           {
-            "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+            "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
           }
         ],
         [

diff --git a/iris/service/package.json b/iris/service/package.json
@@ -32,7 +32,7 @@
       [
         "@semantic-release/exec",
         {
-          "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+          "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
         }
       ],
       [

diff --git a/mercury/mercury-library/package.json b/mercury/mercury-library/package.json
@@ -32,7 +32,7 @@
         [
           "@semantic-release/exec",
           {
-            "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+            "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
           }
         ],
         [

diff --git a/mercury/mercury-mediator/package.json b/mercury/mercury-mediator/package.json
@@ -32,7 +32,7 @@
       [
         "@semantic-release/exec",
         {
-          "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+          "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
         }
       ],
       [

diff --git a/pollux/lib/package.json b/pollux/lib/package.json
@@ -32,7 +32,7 @@
         [
           "@semantic-release/exec",
           {
-            "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+            "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
           }
         ],
         [

diff --git a/prism-agent/service/package.json b/prism-agent/service/package.json
@@ -32,7 +32,7 @@
       [
         "@semantic-release/exec",
         {
-          "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+          "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
         }
       ],
       [

diff --git a/prism-node/client/scala-client/package.json b/prism-node/client/scala-client/package.json
@@ -32,7 +32,7 @@
         [
           "@semantic-release/exec",
           {
-            "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+            "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
           }
         ],
         [

diff --git a/shared/package.json b/shared/package.json
@@ -32,7 +32,7 @@
         [
           "@semantic-release/exec",
           {
-            "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+            "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
           }
         ],
         [
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ @@
             [
               "@semantic-release/exec",
               {
-                "publishCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
+                "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\""
               }
             ],
             [
@@ Expand Down @@