diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 1980972cd..da6b1826e 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -2,7 +2,7 @@ name: merge on: push: - branches: [ master ] + branches: [ main ] workflow_dispatch: @@ -21,7 +21,7 @@ jobs: node-version: 20 - run: npm ci - run: npm run build - - run: npx pr-release merge --target master --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change + - run: npx pr-release merge --target main --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 000000000..7fd5bdd22 --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,31 @@ +name: pr + +on: + push: + branches: [ next ] + + workflow_dispatch: + +concurrency: prr:pre-release + +jobs: + pr: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: 20 + - run: npm ci + - run: npm run build + - run: npx pr-release pr --verbose --target main --source next --compact --verbose --minimize-semver-change + env: + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + # The following will publish a prerelease to npm + - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc + name: Setup NPM Auth + env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + - run: npx pr-release infer-prerelease --preid=next --target main --source next --verbose --publish --minimize-semver-change + name: Publish