Skip to content

Commit

Permalink
Restore pr-release stuff, fix target branch
Browse files Browse the repository at this point in the history
  • Loading branch information
dead-claudia committed Sep 23, 2024
1 parent a4bf63d commit 36c503a
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: merge

on:
push:
branches: [ master ]
branches: [ main ]

workflow_dispatch:

Expand All @@ -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 }}

Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 36c503a

Please sign in to comment.