diff --git a/.github/workflows/changelog-action.yml b/.github/workflows/changelog-action.yml deleted file mode 100644 index 326c462..0000000 --- a/.github/workflows/changelog-action.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Conventional Changelog Action -on: - push: - branches: - - main - merge_group: - branches: - - main - -jobs: - changelog: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - with: - persist-credentials: false - fetch-depth: 0 - - - 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 - env: - GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - run: | - git fetch origin stable - git checkout stable - git merge main - git push diff --git a/.github/workflows/npm-deploy.yaml b/.github/workflows/npm-deploy.yaml index 5242815..3a669c2 100644 --- 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