Skip to content

Commit 36c503a

Browse files
committed
Restore pr-release stuff, fix target branch
1 parent a4bf63d commit 36c503a

File tree

2 files changed

+33
-2
lines changed

2 files changed

+33
-2
lines changed

.github/workflows/merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: merge
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66

77
workflow_dispatch:
88

@@ -21,7 +21,7 @@ jobs:
2121
node-version: 20
2222
- run: npm ci
2323
- run: npm run build
24-
- run: npx pr-release merge --target master --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change
24+
- run: npx pr-release merge --target main --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change
2525
env:
2626
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
2727

.github/workflows/pr.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: pr
2+
3+
on:
4+
push:
5+
branches: [ next ]
6+
7+
workflow_dispatch:
8+
9+
concurrency: prr:pre-release
10+
11+
jobs:
12+
pr:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v4
17+
- uses: actions/setup-node@v4
18+
with:
19+
node-version: 20
20+
- run: npm ci
21+
- run: npm run build
22+
- run: npx pr-release pr --verbose --target main --source next --compact --verbose --minimize-semver-change
23+
env:
24+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
25+
# The following will publish a prerelease to npm
26+
- run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
27+
name: Setup NPM Auth
28+
env:
29+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
30+
- run: npx pr-release infer-prerelease --preid=next --target main --source next --verbose --publish --minimize-semver-change
31+
name: Publish

0 commit comments

Comments
 (0)