diff --git a/.github/workflows/changelog-generator.yaml b/.github/workflows/changelog-generator.yaml index 7d2ae930..4dc4dca0 100644 --- a/.github/workflows/changelog-generator.yaml +++ b/.github/workflows/changelog-generator.yaml @@ -2,7 +2,7 @@ name: changelog-generator on: push: - branches: [ develop ] + branches: [ develop, stable ] jobs: generate_changelog: diff --git a/.github/workflows/merge-release.yaml b/.github/workflows/merge-release.yaml deleted file mode 100644 index 1cf5de7a..00000000 --- a/.github/workflows/merge-release.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# This workflow automatically merges the develp branch into the stable -# branch when creating a release -# Created by RaddishIoW -name: Merge release into stable branch -on: - release: - types: [created] -jobs: - merge-branch: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - - name: Merge develop -> stable - uses: devmasx/merge-branch@v1.3.1 - with: - type: now - from_branch: develop - target_branch: stable - github_token: ${{ github.token }} diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/publish-release.yml similarity index 54% rename from .github/workflows/npm-publish.yml rename to .github/workflows/publish-release.yml index e94c7c60..c6ac89fa 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/publish-release.yml @@ -1,22 +1,43 @@ # This workflow will publish a package to GitHub Packages when a release is created # For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages -name: Publish to NPM +name: Publish Release on: release: types: [created] jobs: + publish-npm: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@master + with: + ref: 'develop' + - uses: actions/setup-node@v2 with: node-version: 12 registry-url: https://registry.npmjs.org/ + - run: npm install + - run: npm publish env: NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + + merge-branch: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + with: + ref: 'develop' + + - name: Merge develop -> stable + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: develop + target_branch: stable + github_token: ${{ github.token }}