Merge pull request #795 from jerensl/ci/auto-bump-wait-on-release-npm

Ci/auto bump wait on release npm

.github/workflows/bump-meshery-version.yml

@@ -1,12 +1,30 @@
 name: Bump Meshery, Meshery Extensions and Meshery Cloud
 
 on:
-  release:
-    types: [published]
+  workflow_run:
+    workflows: [Publish Node.js Package]
+    types:
+      - completed
 
 jobs:
+  versions-check:
+    runs-on: ubuntu-latest
+    outputs:
+      current: ${{ steps.current.outputs.VERSION }}
+    steps:
+      - name: Download Version
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          name: e2e-test-reporter
+          github-token: ${{ secrets.GH_ACCESS_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+      - name: Retrieve Version
+        run: |
+          echo "VERSION=$(cat ./version/number)" >> $GITHUB_OUTPUT
+        id: current
   bump-meshery:
     runs-on: ubuntu-latest
+    needs: versions-check
     steps:
       - name: Checkout Meshery code
         uses: actions/checkout@v4
@@ -21,30 +39,31 @@ jobs:
           cache-dependency-path: '**/package-lock.json'
       - name: Make changes to pull request
         working-directory: ui
-        run: npm install @layer5/sistent@latest
+        run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}}
       - name: Create Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.RELEASEDRAFTER_PAT }}
-          commit-message: Bump sistent ${{ github.event.release.tag_name }} dependencies
+          commit-message: Bump sistent v${{ needs.versions-check.outputs.current }} dependencies
           committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           signoff: true
           branch: bump-sistent-bot
           delete-branch: true
-          title: '[Chore]: Bump ${{ github.event.release.name }}'
+          title: '[Chore]: Bump v${{ needs.versions-check.outputs.current }}'
           add-paths: |
             ui/package.json
             ui/package-lock.json
           body: |
-            Update to Sistent ${{ github.event.release.tag_name }}
+            Update to Sistent v${{ needs.versions-check.outputs.current }}
             
             _This pull request has been auto-generated by [l5io](http://github.com/l5io)_
           assignees: l5io
           draft: false
   bump-meshery-extensions:
     runs-on: ubuntu-latest
+    needs: versions-check
     steps:
       - name: Checkout Meshery Extensions code
         uses: actions/checkout@v4
@@ -59,30 +78,31 @@ jobs:
           cache-dependency-path: '**/package-lock.json'
       - name: Make changes to pull request
         working-directory: meshmap
-        run: npm install @layer5/sistent@latest
+        run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}}
       - name: Create Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.RELEASEDRAFTER_PAT }}
-          commit-message: Bump sistent ${{ github.event.release.tag_name }} dependencies
+          commit-message: Bump sistent v${{ needs.versions-check.outputs.current }} dependencies
           committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           signoff: true
           branch: bump-sistent-bot
           delete-branch: true
-          title: '[Chore]: Bump ${{ github.event.release.name }}'
+          title: '[Chore]: Bump v${{needs.versions-check.outputs.current }}'
           add-paths: |
             meshmap/package.json
             meshmap/package-lock.json
           body: |
-            Update to Sistent ${{ github.event.release.tag_name }}
+            Update to Sistent v${{ needs.versions-check.outputs.current }}
             
             _This pull request has been auto-generated by [l5io](http://github.com/l5io)_
           assignees: l5io
           draft: false
   bump-meshery-cloud:
     runs-on: ubuntu-latest
+    needs: versions-check
     steps:
       - name: Checkout Meshery Extensions code
         uses: actions/checkout@v4
@@ -97,24 +117,24 @@ jobs:
           cache-dependency-path: '**/package-lock.json'
       - name: Make changes to pull request
         working-directory: ui
-        run: npm install @layer5/sistent@latest
+        run: npm install @layer5/sistent@${{needs.versions-check.outputs.current}}
       - name: Create Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.RELEASEDRAFTER_PAT }}
-          commit-message: Bump sistent ${{ github.event.release.tag_name }} dependencies
+          commit-message: Bump sistent v${{ needs.versions-check.outputs.current }} dependencies
           committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           signoff: true
           branch: bump-sistent-bot
           delete-branch: true
-          title: '[Chore]: Bump ${{ github.event.release.name }}'
+          title: '[Chore]: Bump v${{ needs.versions-check.outputs.current }}'
           add-paths: |
             ui/package.json
             ui/package-lock.json
           body: |
-            Update to Sistent ${{ github.event.release.tag_name }}
+            Update to Sistent v${{ needs.versions-check.outputs.current }}
             
             _This pull request has been auto-generated by [l5io](http://github.com/l5io)_
           assignees: l5io

.github/workflows/release.yml

@@ -44,3 +44,30 @@ jobs:
           npm publish --verbose
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}      
+  versions-check:
+    needs: publish-gpr
+    runs-on: ubuntu-latest
+    outputs:
+      current: ${{ steps.versions.outputs }}
+    steps:
+      - uses: actions/github-script@v7
+        id: versions
+        with:
+          result-encoding: string
+          script: |
+            let str = "${{github.event.release.tag_name}}"
+
+            return str.replace(/^v/, '')
+      - name: Save Release number
+        if: ${{ !cancelled() }}
+        run: |
+          mkdir -p ./version
+          echo ${{ steps.versions.outputs }} > ./version/number
+      - name: Upload Version Report
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+        with:
+          name: version-number
+          path: |
+            version/number
+          retention-days: 14