Revisions based on feedback
This commit is contained in:
parent
2a2aef7762
commit
ff646e8fb8
6 changed files with 3897 additions and 20 deletions
2
.github/workflows/auto-merge.yml
vendored
2
.github/workflows/auto-merge.yml
vendored
|
|
@ -8,7 +8,7 @@ jobs:
|
||||||
auto-merge:
|
auto-merge:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- uses: ahmadnassri/action-dependabot-auto-merge@v2
|
- uses: ahmadnassri/action-dependabot-auto-merge@v2
|
||||||
with:
|
with:
|
||||||
target: patch
|
target: patch
|
||||||
|
|
|
||||||
4
.github/workflows/merge.yml
vendored
4
.github/workflows/merge.yml
vendored
|
|
@ -18,7 +18,7 @@ jobs:
|
||||||
node-version: [16.x]
|
node-version: [16.x]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
ref: 'next'
|
ref: 'next'
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
@ -29,7 +29,7 @@ jobs:
|
||||||
node-version: ${{ matrix.node-version }}
|
node-version: ${{ matrix.node-version }}
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
- run: npm run build --if-present
|
- run: npm run build
|
||||||
- run: npx pr-release merge --target main --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact
|
- run: npx pr-release merge --target main --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||||
|
|
|
||||||
7
.github/workflows/pr.yml
vendored
7
.github/workflows/pr.yml
vendored
|
|
@ -6,6 +6,9 @@ on:
|
||||||
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
pull_request:
|
||||||
|
types: [labeled, unlabeled, edited]
|
||||||
|
|
||||||
concurrency: prr:pre-release
|
concurrency: prr:pre-release
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
@ -18,14 +21,14 @@ jobs:
|
||||||
node-version: [16.x]
|
node-version: [16.x]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- name: Use Node.js ${{ matrix.node-version }}
|
- name: Use Node.js ${{ matrix.node-version }}
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v3
|
||||||
with:
|
with:
|
||||||
node-version: ${{ matrix.node-version }}
|
node-version: ${{ matrix.node-version }}
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
- run: npm run build --if-present
|
- run: npm run build
|
||||||
- run: npx pr-release pr --verbose --target main --source next --compact --verbose
|
- run: npx pr-release pr --verbose --target main --source next --compact --verbose
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||||
|
|
|
||||||
4
.github/workflows/rollback.yml
vendored
4
.github/workflows/rollback.yml
vendored
|
|
@ -15,7 +15,7 @@ jobs:
|
||||||
node-version: [16.x]
|
node-version: [16.x]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
ref: 'next'
|
ref: 'next'
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
@ -25,7 +25,7 @@ jobs:
|
||||||
node-version: ${{ matrix.node-version }}
|
node-version: ${{ matrix.node-version }}
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
- run: npm run build --if-present
|
- run: npm run build
|
||||||
- run: npx pr-release rollback --verbose --target main --source next --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md
|
- run: npx pr-release rollback --verbose --target main --source next --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ In future we may collapse these into a single file, the separation is due to the
|
||||||
|
|
||||||
Whenever a new feature branch is opened, a reviewing maintainer should add the correct semver label to their PR (`major` | `minor` | `patch`). If no label is set, `patch` is assumed.
|
Whenever a new feature branch is opened, a reviewing maintainer should add the correct semver label to their PR (`major` | `minor` | `patch`). If no label is set, `patch` is assumed.
|
||||||
|
|
||||||
If a `major` or `minor` feature branch is merge, but no labels were set, you can go back and apply the labels and then re-run the `pr` workflow in github actions, this will recalculate the semver version.
|
If a `major` or `minor` feature branch is merged but no labels were set, you can still go back and edit the semver labels. On label change the release pr will automatically be regenerated and will recalculate the semver version.
|
||||||
|
|
||||||
## Updating mithril.js.org
|
## Updating mithril.js.org
|
||||||
|
|
||||||
|
|
@ -63,4 +63,4 @@ After the docs build completes, the updated docs should appear on https://mithri
|
||||||
|
|
||||||
**Note:** When updating the stable version with a release candidate out, ***make sure to update the index + navigation to point to the new stable version!!!***
|
**Note:** When updating the stable version with a release candidate out, ***make sure to update the index + navigation to point to the new stable version!!!***
|
||||||
|
|
||||||
[pr-release]: https://pr-release.org/
|
[pr-release]: https://pr-release.org/
|
||||||
|
|
|
||||||
3896
package-lock.json
generated
3896
package-lock.json
generated
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue