diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 58e6667..61a5a9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,7 +60,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} if: ${{ github.event.inputs.preRelease == 'no' }} - name: Pre-Release - run: npx release-it --github.release --ci --npm.skipChecks --no-git.requireCleanWorkingDir --preRelease=alpha --github.preRelease --npm.tag=next + run: npx release-it ${{github.event.inputs.releaseType}} --github.release --ci --npm.skipChecks --no-git.requireCleanWorkingDir --preRelease=alpha --github.preRelease --npm.tag=next env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml new file mode 100644 index 0000000..a109783 --- /dev/null +++ b/.github/workflows/update.yml @@ -0,0 +1,32 @@ +# this workflow merges requests from Dependabot if tests are passing +name: Merge me! + +on: + workflow_run: + types: + - completed + workflows: + - "Test" + +jobs: + merge-me: + name: Merge me! + + runs-on: ubuntu-latest + + steps: + - name: Merge me! + if: ${{ github.event.workflow_run.conclusion == 'success' }} + uses: ridedott/merge-me-action@v2 + with: + # Depending on branch prodtection rules, a manually populated + # `GITHUB_TOKEN_WORKAROUND` secret with permissions to push to + # a protected branch must be used. + # + # When using a custom token, it is recommended to leave the following + # comment for other developers to be aware of the reasoning behind it: + # + # This must be used as GitHub Actions token does not support pushing + # to protected branches. + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PRESET: DEPENDABOT_MINOR