next -> main
This commit is contained in:
parent
33e1562fc1
commit
abd7f86888
9 changed files with 15 additions and 17 deletions
4
.github/workflows/merge.yml
vendored
4
.github/workflows/merge.yml
vendored
|
|
@ -15,13 +15,13 @@ jobs:
|
|||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: next
|
||||
ref: main
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20
|
||||
- run: npm ci
|
||||
- run: npm run build
|
||||
- run: npx pr-release merge --target release --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change
|
||||
- run: npx pr-release merge --target release --source main --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
|
||||
|
|
|
|||
6
.github/workflows/pr.yml
vendored
6
.github/workflows/pr.yml
vendored
|
|
@ -2,7 +2,7 @@ name: pr
|
|||
|
||||
on:
|
||||
push:
|
||||
branches: [ next ]
|
||||
branches: [ main ]
|
||||
|
||||
workflow_dispatch:
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ jobs:
|
|||
node-version: 20
|
||||
- run: npm ci
|
||||
- run: npm run build
|
||||
- run: npx pr-release pr --verbose --target release --source next --compact --verbose --minimize-semver-change
|
||||
- run: npx pr-release pr --verbose --target release --source main --compact --verbose --minimize-semver-change
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
# The following will publish a prerelease to npm
|
||||
|
|
@ -27,5 +27,5 @@ jobs:
|
|||
name: Setup NPM Auth
|
||||
env:
|
||||
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||
- run: npx pr-release infer-prerelease --preid=next --target release --source next --verbose --publish --minimize-semver-change
|
||||
- run: npx pr-release infer-prerelease --preid=next --target release --source main --verbose --publish --minimize-semver-change
|
||||
name: Publish
|
||||
|
|
|
|||
2
.github/workflows/push-main.yml
vendored
2
.github/workflows/push-main.yml
vendored
|
|
@ -9,5 +9,3 @@ jobs:
|
|||
comment:
|
||||
uses: MithrilJS/infra/.github/workflows/reject-pr.yml@main
|
||||
secrets: inherit
|
||||
with:
|
||||
correct_branch: next
|
||||
|
|
|
|||
2
.github/workflows/rollback.yml
vendored
2
.github/workflows/rollback.yml
vendored
|
|
@ -16,6 +16,6 @@ jobs:
|
|||
node-version: 20
|
||||
- run: npm ci
|
||||
- run: npm run build
|
||||
- run: npx pr-release rollback --verbose --target release --source next --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md
|
||||
- run: npx pr-release rollback --verbose --target release --source main --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
name: test-next-push
|
||||
name: test-main-push
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ next ]
|
||||
branches: [ main ]
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency: prr:pre-release
|
||||
|
|
@ -21,7 +21,7 @@ jobs:
|
|||
node-version: 20
|
||||
- run: npm ci
|
||||
- run: npm run build
|
||||
- run: npx pr-release pr --verbose --target release --source next --compact --verbose --minimize-semver-change
|
||||
- run: npx pr-release pr --verbose --target release --source main --compact --verbose --minimize-semver-change
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
# The following will publish a prerelease to npm
|
||||
|
|
@ -29,5 +29,5 @@ jobs:
|
|||
name: Setup NPM Auth
|
||||
env:
|
||||
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||
- run: npx pr-release infer-prerelease --preid=next --target release --source next --verbose --publish --minimize-semver-change
|
||||
- run: npx pr-release infer-prerelease --preid=next --target release --source main --verbose --publish --minimize-semver-change
|
||||
name: Publish
|
||||
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
|
|
@ -2,7 +2,7 @@ name: test
|
|||
|
||||
on:
|
||||
pull_request_target:
|
||||
branches: [ next ]
|
||||
branches: [ main ]
|
||||
workflow_dispatch:
|
||||
workflow_call:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue