Update instructions around release testing and RC0

website/contributing/release-branch-cut-and-rc0.md

@@ -4,7 +4,6 @@ title: Branch Cut & RC0
 ---
 
 import AsyncTestingNote from './\_markdown-async-testing-note.mdx';
-import BumpOSSNote from './\_markdown-older-bump-script.mdx';
 import GHReleasesNotesPrerelease from './\_markdown-GH-release-notes-prerelease.mdx';
 import RoadToReleaseTemplate from './\_markdown-road-to-release-template.mdx';
 
@@ -42,13 +41,7 @@ Documents in this section go over steps to run different types of React Native r
 
 - Add and commit the extra file that got created at `packages/react-native/sdks/hermes/.hermesversion`.
 
-### 3. Bump monorepo packages
-
-- Update packages in the monorepo by running `yarn bump-all-updated-packages`. Bear in mind that all the package bumps must be on patch level, and be on the minor you are working on. We need to publish the latest package changes so they will be included in RC0. Read more about the script and how they work [here](./release-updating-packages).
-
-- CI will take care of releasing the new versions on npm once you push the changes to the `0.XX-stable` branch.
-
-### 4. Push the branch and test the current changes
+### 3. Push the branch and test the current changes
 
 You can now push the branch you created so that others can also start testing:
 
@@ -60,6 +53,12 @@ Before continuing further, follow the [testing guide](/contributing/release-test
 
 <AsyncTestingNote/>
 
+### 4. Bump monorepo packages
+
+- Update monorepo package dependencies by running `yarn bump-all-updated-packages`. Bear in mind that all the package bumps must be on patch level, and be on the minor you are working on. Read more about this script and how it works [here](./release-updating-packages).
+- Push the newly generated commit. A CI workflow will publish the new versions of each monorepo package (excluding `react-native`) to npm.
+- Wait for this workflow to successfully complete before continuing.
+
 ### 5. Kick off the build of `0.{minor}.0-rc.0`
 
 Once you're done with the testing, you can kick-off the bump and publishing of RC0:
@@ -69,8 +68,6 @@ Once you're done with the testing, you can kick-off the bump and publishing of R
 yarn trigger-react-native-release --to-version 0.69.0-rc.0 --token <YOUR_CIRCLE_CI_TOKEN>
 ```
 
-<BumpOSSNote/>
-
 - Once you have run that script, head to CircleCI and you should see under the releases workflow, a `prepare-package-for-release` job.
 
  <figure>
@@ -95,7 +92,7 @@ yarn trigger-react-native-release --to-version 0.69.0-rc.0 --token <YOUR_CIRCLE_
 
 To generate the changelog, we rely on a dedicated tool called [`@rnx-kit/rn-changelog-generator`](https://github.com/microsoft/rnx-kit/tree/main/incubator/rn-changelog-generator) that will parse the custom changelog messages that contributors write in their PRs.
 
-Note: Due to the number of commits for an RC0, this operation is likely to hit GitHub API limits. The snippet below set the optional `--token` arg, which can be obtained from [GitHub Settings > Developer Settings > Personal access tokens](https://github.com/settings/tokens/new?description=react-native-changelog&scopes=public_repo).
+Note: Due to the number of commits for an RC0, this operation is likely to hit GitHub API limits. The snippet below set the optional `--token` arg, which can be obtained from [GitHub Settings > Developer Settings > Personal access tokens > Fine-grained tokens](https://github.com/settings/tokens?type=beta).
 
 ```bash
 # Run following with the stable release as base, and your rc.0 version
@@ -130,35 +127,34 @@ For both these categories, we have to manually go through the listed commits and
 
 <GHReleasesNotesPrerelease />
 
-### 8. Upload prebuilt Hermes binary
-
-In the `publish_release` CI workflow, the `build_hermes_macos` step produces a `tmp/hermes/output/hermes-runtime-darwin-vx.y.z.tar.gz` artifact, for example [here](https://app.circleci.com/pipelines/github/facebook/react-native/13933/workflows/5f2ad198-2264-4e7e-8c62-7b28e97532d8/jobs/262322/artifacts) are the artifacts for `0.69.0` release. Download it and attach it to the GitHub release.
-
-### 9. Create a tracking discussion post
+### 8. Create a tracking discussion post
 
 Create a "Road to [YOUR_MINOR_VERSION]" discussion post in the [`react-native-releases`](https://github.com/reactwg/react-native-releases/discussions) working group:
 
 <RoadToReleaseTemplate />
 
 After creating it, make sure to link it in the relevant GitHub Release you created above, and to pin it in the discussion repo.
 
-### 10. Verify that Upgrade Helper GitHub action has fired
+### 9. Verify that Upgrade Helper GitHub action has fired
 
 - You should see a [new publish job here](https://github.com/react-native-community/rn-diff-purge/actions).
 - Once it has finished, you should be able to see that the [Upgrade Helper](https://react-native-community.github.io/upgrade-helper/) presents the option to target the new RC0.
 - If not, check out the guide on [how to update Upgrade Helper](/contributing/updating-upgrade-helper).
 
-### 11. Broadcast that release candidate is out
+### 10. Broadcast that release candidate is out
 
 Once all the steps above have been completed, it's time to signal to the community that RC0 is available for testing! Do so in the following channels:
 
 - [@reactnative](https://twitter.com/reactnative) on twitter
 - RN Discord `#releases-coordination`
 
-### 12. Bump minor version of all monorepo packages in `main`
+### 11. Bump minor version of all monorepo packages in `main`
 
-The packages in the `react-native` monorepo must always be one minor version ahead of the latest or RC version (e.g. if you have cut `0.72-stable`, main needs to be in `0.73.x`. Once you're done with releasing the initial RC0, you should:
+Now we've cut a stable release branch, let's update the versions of each package on `main`. This is in the format `0.[next-major].0-main`.
+
+```sh
+node scripts/releases/set-version 0.75.0-main --skip-react-native-version
+git commit -a -m "Bump packages for next major release"
+```
 
-- Create a new branch in `react-native` from `main` in your own fork.
-- Run `yarn bump-all-updated-packages --release-branch-cutoff` to bump the minor versions of all packages.
-- Create a PR targeting `main` in `react-native` with the commit created by the previous command.
+After running, push your changes to a new branch and submit a PR to `main`.

website/contributing/release-candidate-patch.md

@@ -5,7 +5,6 @@ title: RC Patches
 
 import AsyncTestingNote from './\_markdown-async-testing-note.mdx';
 import GHReleasesNotesPrerelease from './\_markdown-GH-release-notes-prerelease.mdx';
-import BumpOSSNote from './\_markdown-older-bump-script.mdx';
 
 :::info
 Documents in this section go over steps to run different types of React Native release updates. Its intended audience is those in [relevant release roles](./release-roles-responsibilites.md).
@@ -58,8 +57,6 @@ git push
 yarn trigger-react-native-release --to-version 0.y.0-rc.x --token <YOUR_CIRCLE_CI_TOKEN>
 ```
 
-<BumpOSSNote />
-
 ### 5. Watch CircleCI to ensure right jobs are being triggered
 
 - Once you have run the bump script script, head to CircleCI and you should see under the releases workflow, a `prepare-package-for-release` job.

website/contributing/release-stable-minor.md

@@ -3,8 +3,6 @@ id: release-stable-minor
 title: Minor Stable 0.Y.0
 ---
 
-import BumpOSSNote from './\_markdown-older-bump-script.mdx';
-
 :::info
 Documents in this section go over steps to run different types of React Native release updates. Its intended audience is those in [relevant release roles](./release-roles-responsibilites.md).
 :::
@@ -31,8 +29,6 @@ yarn trigger-react-native-release --to-version 0.Y.0 --token <YOUR_CIRCLE_CI_TOK
 # This updates npm registry to point to this version as "latest"
 ```
 
-<BumpOSSNote />
-
 When this is done, all the other PRs (changelog, documentation, blog post) should also get merged.
 
 ### 2. Update the GitHub releases

website/contributing/release-stable-patch.md

@@ -4,7 +4,6 @@ title: Minor Stable Patches
 ---
 
 import AsyncTestingNote from './\_markdown-async-testing-note.mdx';
-import BumpOSSNote from './\_markdown-older-bump-script.mdx';
 
 :::info
 Documents in this section go over steps to run different types of React Native release updates. Its intended audience is those in [relevant release roles](./release-roles-responsibilites.md).
@@ -30,7 +29,11 @@ git cherry-pick <commit>
 
 ### 2. Bump monorepo packages
 
-**For 0.72 and higher:**
+**For 0.74 and later:**
+
+Skip this step — we'll version the monorepo package dependencies _after local testing_.
+
+**For 0.72-0.73:**
 
 Update all packages in the monorepo that were modified by the cherry picks. You can do it by running:
 
@@ -63,7 +66,18 @@ Before continuing further, follow the [testing guide](/contributing/release-test
 
 <AsyncTestingNote/>
 
-### 4. Run `trigger-react-native-release` script
+### 4. (0.74 and later only) Bump monorepo packages
+
+- Version the monorepo package dependencies by running `yarn bump-all-updated-packages`.
+- Push the newly generated commit. A CI workflow will publish the new versions of each monorepo package (excluding `react-native`) to npm.
+- Wait for this workflow to successfully complete before continuing.
+
+```sh
+yarn bump-all-updated-packages # All the package bumps must be on the patch level
+git push origin 0.XX-stable
+```
+
+### 5. Run `trigger-react-native-release` script
 
 ```bash
 # once verified all the cherry-picked commits, we can push them to remote
@@ -74,9 +88,7 @@ git push
 yarn trigger-react-native-release --to-version x.y.z --token <YOUR_CIRCLE_CI_TOKEN>
 ```
 
-<BumpOSSNote />
-
-### 5. Watch CircleCI to ensure right jobs are being triggered
+### 6. Watch CircleCI to ensure right jobs are being triggered
 
 - Once you have run the bump script script, head to CircleCI and you should see under the releases workflow, a `prepare-package-for-release` job.
 
@@ -94,7 +106,7 @@ yarn trigger-react-native-release --to-version x.y.z --token <YOUR_CIRCLE_CI_TOK
  latest: 0.Y.Z next: 0.Y.0-rc.X nightly: 0.0.0-f617e022c
  ```
 
-### 6. Create a PR of the changelog using the generator
+### 7. Create a PR of the changelog using the generator
 
 To generate the changelog, we rely on a dedicated tool called [`@rnx-kit/rn-changelog-generator`](https://github.com/microsoft/rnx-kit/tree/main/incubator/rn-changelog-generator) that will parse the custom changelog messages that contributors write in their PRs.
 
@@ -110,7 +122,7 @@ npx @rnx-kit/rn-changelog-generator --base v0.68.2 --compare v0.68.3 \
 
 Create a pull request of this change to `react-native` repo and add the `Changelog` label.
 
-### 7. Create GitHub Release
+### 8. Create GitHub Release
 
 Use template below for the GitHub Release:
 
@@ -134,11 +146,11 @@ To help you upgrade to this version, you can use the [upgrade helper](https://re
 You can find the whole changelog history in the [changelog.md file](https://github.com/facebook/react-native/blob/main/CHANGELOG.md).
 ```
 
-### 8. Upload prebuilt Hermes binary
+### 9. Upload prebuilt Hermes binary
 
 In the `publish_release` CI workflow, the `build_hermes_macos` step produces a `tmp/hermes/output/hermes-runtime-darwin-vx.y.z.tar.gz` artifact, for example [here](https://app.circleci.com/pipelines/github/facebook/react-native/13933/workflows/5f2ad198-2264-4e7e-8c62-7b28e97532d8/jobs/262322/artifacts) are the artifacts for `0.69.0` release. Download it and attach it to the GitHub release.
 
-### 9. Create a new patch discussion post using template below
+### 10. Create a new patch discussion post using template below
 
 ```markdown
 <!-- Template for new patch -->
@@ -170,19 +182,19 @@ If the issue is a [major release issues](https://reactnative.dev/contributing/re
 1.
 ```
 
-### 10. Update "should we release 0.Y.Z?" discussion post
+### 11. Update "should we release 0.Y.Z?" discussion post
 
 - Label it `Released`.
 - Update the text body saying the patch has been released and link to new patch discussion.
 - Lock the discussion.
 
-### 11. Verify that Upgrade Helper GitHub action has fired
+### 12. Verify that Upgrade Helper GitHub action has fired
 
 - You should see a [new publish job here](https://github.com/react-native-community/rn-diff-purge/actions).
 - Once it has finished, you should be able to see that the [Upgrade Helper](https://react-native-community.github.io/upgrade-helper/) presents the option to target the new minor.
 - If not, check out the guide on [how to update Upgrade Helper](/contributing/updating-upgrade-helper).
 
-### 12. Communicate the new release
+### 13. Communicate the new release
 
 Once all the steps above have been completed, it's time to signal to the community that latest minor is available! Do so in the following channels:
 

website/contributing/release-testing.md

@@ -79,15 +79,22 @@ Followed by the wanted options:
 Using the `-c <your-token>` option is recommended, as the script will download the required artifacts from CircleCI, instead of having to build from source reducing the testing time.
 There are a couple of extra requirements to make this flow work:
 1. the CI must have run at least once in the current branch. We need to download artifacts generated by CircleCI, so we need to have at least one run of the CI.
-2. The relevant jobs must have been finished. The required jobs depends on the task you are about to tests:
- - if you are testing RNTester on iOS, it has to download Hermes for iOS. So the job that produces it must have finished successfully
- - if you are testing RNTester on Android, it has to download the right APK (JSC or Hermes). So the job that produces the APKs must have finished successfully.
- - if you are testing RNTestProject, it has to download the maven prebuilts and the Hermes engine for iOS. So the jobs that produce those artifacts must have finished successfully.
+2. The relevant jobs must have been finished. The required jobs depends on the task you are about to test:
+- if you are testing RNTester on iOS, it has to download Hermes for iOS. So the job that produces it must have finished successfully
+- if you are testing RNTester on Android, it has to download the right APK (JSC or Hermes). So the job that produces the APKs must have finished successfully.
+- if you are testing RNTestProject, it has to download the maven prebuilts and the Hermes engine for iOS. So the jobs that produce those artifacts must have finished successfully.
 
 Anyway, if any of those prerequisites is not met, the script should output a proper error message.
 
 If you need to build React Native from source, you can skip the `-c` parameter. By not passing the CircleCI token, the script falls back to the previous flow, building everything locally.
 
+After completing testing, clean up your local repository state using the following commands.
+
+```sh
+yarn test-e2e-local-clean
+git reset HEAD --hard
+```
+
 #### Versions older than 71
 
 You need to use the interactive script run you through the different variants in [Test Dimensions](#test-dimensions):

website/contributing/release-updating-packages.md

@@ -58,24 +58,16 @@ We have a [CircleCI workflow](https://github.com/facebook/react-native/blob/2922
 #### Pseudocode
 
 ```
-for each package:
-if last commit contains version change:
- if this commit has specific message:
+if last commit contains '#publish-packages-to-npm'
+for each package:
+ if package version is not present on npm registry:
  publish package to npm
 ```
 
 #### Notes
 
 This workflow explicitly checks that commit has a specific [tag](https://github.com/facebook/react-native/blob/main/scripts/monorepo/constants.js#L11) inside its message. This is used to prevent accidental publishes. To create such specific commit you should use [script from above](https://github.com/facebook/react-native/wiki/Release-and-its-automated-processes#finding-all-packages-that-have-unpublished-changes).
 
-If you want to bump package version and publish it to npm registry, your version change should be exactly in the last commit. This is because of two things:
-
-1. If multiple commits are merged to `main` branch at the same time, CircleCI will execute workflows only once on top of the latest commit.
-2. To determine that version was changed we [evaluate the difference between HEAD and HEAD~1](https://github.com/facebook/react-native/blob/daeee2a6619db59391de3b7c6e08db0dbe2331aa/scripts/monorepo/find-and-publish-all-bumped-packages.js#L32-L35).
-
-Example script output, where no package versions were changed:
-<img width="800" alt="Screenshot 2023-01-03 at 12 21 01" src="https://user-images.githubusercontent.com/28902667/210362611-97530b4d-0405-499c-9a3c-5542e069e929.png" />
-
 ## Align package versions across monorepo
 
 #### Use case