Skip to content

Commit

Permalink
Revisions based on feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
JAForbes authored and StephanHoyer committed Apr 27, 2022
1 parent 2a2aef7 commit ff646e8
Show file tree
Hide file tree
Showing 6 changed files with 3,897 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
auto-merge:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
target: patch
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
node-version: [16.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: 'next'
fetch-depth: 0
Expand All @@ -29,7 +29,7 @@ jobs:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- 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
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:

workflow_dispatch:

pull_request:
types: [labeled, unlabeled, edited]

concurrency: prr:pre-release

jobs:
Expand All @@ -18,14 +21,14 @@ jobs:
node-version: [16.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- 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
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rollback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
node-version: [16.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: 'next'
fetch-depth: 0
Expand All @@ -25,7 +25,7 @@ jobs:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- 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
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
4 changes: 2 additions & 2 deletions docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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

Expand All @@ -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!!!***

[pr-release]: https://pr-release.org/
[pr-release]: https://pr-release.org/
Loading

0 comments on commit ff646e8

Please sign in to comment.