Merge pull request #213 from meshery/aabidsofi19-patch-2

Configure git before publishing

.github/workflows/publish-npm-package.yml

@@ -1,6 +1,3 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
-
 name: Publish NPM Package
 
 on:
@@ -31,14 +28,16 @@ on:
 jobs:
   publish-gpr:
     runs-on: ubuntu-latest
-    permissions: write-all
+    permissions:
+      contents: write
     steps:
-      - name: Checkout
-        uses: actions/checkout@master
+      - name: Checkout Repository
+        uses: actions/checkout@v3
         with:
-          ref: "master"
+          ref: ${{ github.ref_name }}
 
-      - uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
         with:
           node-version: 16
           registry-url: "https://registry.npmjs.org"
@@ -47,36 +46,50 @@ jobs:
       - name: Install Dependencies
         run: npm ci
 
+      - name: Configure Git
+        run: |
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
+
       - name: Update Release Version
         env:
-          RELEASE_VERSION: ${{ inputs.release_version }}
-          RELEASE_VARIANT: ${{ inputs.release_variant }}
+          RELEASE_VERSION: ${{ inputs.release_version || 'prerelease' }}
+          RELEASE_VARIANT: ${{ inputs.release_variant || 'stable' }}
         run: |
+          set -e
           OLD_VERSION=$(node -e "console.log(require('./package.json').version)")
-          if [ $RELEASE_VERSION == "prerelease" ] && [ $RELEASE_VARIANT != "stable" ]; then npm version ${RELEASE_VERSION} --preid ${RELEASE_VARIANT}; fi
-          if [ $RELEASE_VERSION == "prerelease" ] && [ $RELEASE_VARIANT == "stable" ]; then npm version ${RELEASE_VERSION}; fi
-          if [ $RELEASE_VERSION != "prerelease" ] && [ $RELEASE_VARIANT != "stable" ]; then npm version pre${RELEASE_VERSION} --preid ${RELEASE_VARIANT}; fi
-          if [ $RELEASE_VERSION != "prerelease" ] && [ $RELEASE_VARIANT == "stable" ]; then npm version ${RELEASE_VERSION}; fi
-
+          if [ "$RELEASE_VERSION" == "prerelease" ] && [ "$RELEASE_VARIANT" != "stable" ]; then 
+            npm version "${RELEASE_VERSION}" --preid "${RELEASE_VARIANT}"; 
+          elif [ "$RELEASE_VERSION" == "prerelease" ] && [ "$RELEASE_VARIANT" == "stable" ]; then 
+            npm version "${RELEASE_VERSION}"; 
+          elif [ "$RELEASE_VERSION" != "prerelease" ] && [ "$RELEASE_VARIANT" != "stable" ]; then 
+            npm version "pre${RELEASE_VERSION}" --preid "${RELEASE_VARIANT}"; 
+          else 
+            npm version "${RELEASE_VERSION}"; 
+          fi
           NEW_VERSION=$(node -e "console.log(require('./package.json').version)")
           echo "Updated Package Version" >> $GITHUB_STEP_SUMMARY
           echo "info Old Version: ${OLD_VERSION}" >> $GITHUB_STEP_SUMMARY
           echo "info New Version: ${NEW_VERSION}" >> $GITHUB_STEP_SUMMARY
 
       - name: Build Package
         run: |
+          set -e
           npm run build
           echo "Build New Package" >> $GITHUB_STEP_SUMMARY
 
       - name: Publish Package
-        run: npm publish --verbose
+        run: |
+          set -e
+          npm publish --verbose
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      - name: Commit and push version change
+      - name: Commit and Push Version Changes
         run: |
-          git add .
-          git status
-          git pull --rebase -f
-          git push --verbose
-          echo "Pushed Package changes" >> $GITHUB_STEP_SUMMARY
+          set -e
+          git add package.json package-lock.json
+          git commit -m "chore: bump version to ${NEW_VERSION}" || echo "No changes to commit"
+          git pull --rebase
+          git push --force
+          echo "Pushed Package Changes" >> $GITHUB_STEP_SUMMARY