fix: github action bug

ephrimlawrence · Feb 26, 2024 · 6445c91 · 6445c91
1 parent 5624054
commit 6445c91
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 43 deletions.
diff --git a/.github/workflows/changelog-action.yml b/.github/workflows/changelog-action.yml
diff --git a/.github/workflows/npm-deploy.yaml b/.github/workflows/npm-deploy.yaml
@@ -2,10 +2,10 @@ name: Publish Package to npmjs
 on:
   push:
     branches:
-      - stable
+      - main
   merge_group:
     branches:
-      - stable
+      - main
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -21,6 +21,23 @@ jobs:
           node-version: '20.x'
           registry-url: 'https://registry.npmjs.org'
 
+      - name: Bump version and push tag
+        uses: TriPSs/conventional-changelog-action@v3
+        with:
+          github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          git-message: "change log (release): {version}"
+          preset: "angular"
+          tag-prefix: "v"
+          output-file: "CHANGELOG.md"
+          skip-on-empty: false
+
+      - name: Deploy to stable => Merge main -> stable
+        run: |
+          git fetch origin stable
+          git checkout stable
+          git merge main
+          git push
+
       - name: Create Release
         uses: actions/create-release@v1
         env:
@@ -32,9 +49,10 @@ jobs:
           draft: false
           prerelease: false
 
-      - run: npm ci --legacy-peer-deps
-      - run: |
-          npm run bundle
-          npm publish
+      - name: Publish package to npm
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          npm ci --legacy-peer-deps
+          npm run bundle
+          npm publish