Restore pr-release stuff, fix target branch
This commit is contained in:
parent
a4bf63d899
commit
36c503a9d7
2 changed files with 33 additions and 2 deletions
4
.github/workflows/merge.yml
vendored
4
.github/workflows/merge.yml
vendored
|
|
@ -2,7 +2,7 @@ name: merge
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master ]
|
branches: [ main ]
|
||||||
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
|
@ -21,7 +21,7 @@ jobs:
|
||||||
node-version: 20
|
node-version: 20
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
- run: npm run build
|
- 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:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||||
|
|
||||||
|
|
|
||||||
31
.github/workflows/pr.yml
vendored
Normal file
31
.github/workflows/pr.yml
vendored
Normal file
|
|
@ -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
|
||||||
Loading…
Add table
Add a link
Reference in a new issue