Skip to content

Commit 3778eac

Browse files
committed
Merge branch 'release-6.4.4' into dev
2 parents 44b6af7 + 12e7c28 commit 3778eac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1921
-343
lines changed

.changeset/blue-cycles-check.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/flat-trainers-speak.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/funny-oranges-arrive.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changeset/pretty-dolls-bathe.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changeset/proud-timers-tickle.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changeset/stale-coats-smoke.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/postrelease.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: 🕊 Post-release
2+
3+
on:
4+
push:
5+
tags:
6+
# only run on `react-router` tags
7+
- "react-router@*"
8+
9+
jobs:
10+
comment:
11+
name: 📝 Comment on related issues and pull requests
12+
if: github.repository == 'remix-run/react-router'
13+
uses: ./.github/workflows/release-comments.yml
14+
with:
15+
ref: ${{ github.ref }}
16+
# this should match the above tag to watch excluding the trailing "@"
17+
packageVersionToFollow: "react-router"

.github/workflows/release-comments.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
ref:
77
required: true
88
type: string
9+
packageVersionToFollow:
10+
required: true
11+
type: string
912

1013
jobs:
1114
comment:
@@ -20,16 +23,20 @@ jobs:
2023
uses: actions/setup-node@v3
2124
with:
2225
node-version-file: ".nvmrc"
23-
cache: "yarn"
26+
cache: "npm"
27+
cache-dependency-path: scripts/release/package-lock.json
2428

2529
- name: 📥 Install deps
26-
# even though this is called "npm-install" it does use yarn to install
27-
# because we have a yarn.lock and caches efficiently.
28-
uses: bahmutov/npm-install@v1
30+
run: npm ci
31+
working-directory: ./scripts/release
2932

3033
- name: 📝 Comment on issues
31-
run: node ./scripts/release/comment.mjs
34+
working-directory: ./scripts/release
35+
run: node -r esbuild-register ./comment.ts
3236
env:
3337
GITHUB_REPOSITORY: ${{ github.repository }}
3438
GITHUB_TOKEN: ${{ github.token }}
3539
VERSION: ${{ inputs.ref }}
40+
DEFAULT_BRANCH: "main"
41+
NIGHTLY_BRANCH: "dev"
42+
PACKAGE_VERSION_TO_FOLLOW: ${{ inputs.packageVersionToFollow }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
publish: yarn release
5656
createGithubReleases: false
5757
env:
58-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58+
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN_SO_OTHER_ACTIONS_RUN }}
5959
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
6060

6161
# comment:

DEVELOPMENT.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ You may need to make changes to a pre-release prior to publishing a final stable
3737
- Commit the unpublished changesets and push the the `release-*` branch to GitHub; wait for the release workflow to finish and the Changesets action to open its PR that will increment all versions to stable
3838
- Review the updated `CHANGELOG` files and make any adjustments necessary, then merge the PR
3939
- Once the PR is merged, the release workflow will publish the updated packages to npm
40+
- Once the release is published:
41+
- merge the `release-*` branch into `main` and push it up to github
42+
- merge the `release-*` branch into `dev` and push it up to github
43+
- Convert the `[email protected]` tag to a Release on Github with the name `v6.x.y`
44+
- Copy the relevant changelog entries from all packages into the Release Notes and adjust accordingly, matching the format used by prior releases
4045

4146
### Experimental releases
4247

0 commit comments

Comments
 (0)