Merge pull request #1748 from Saadnajmi/more71

Merge up to upstream release 0.71.6 + Cherry pick publish pipeline refactor from main

Author: Saadnajmi

.ado/Brewfile

@@ -1,2 +1,4 @@
 brew "watchman"
 brew "xcbeautify"
+# macOS 12 doesn't have `realpath` but macOS 13 does. Remove this line when Azure Pipelines supports macOS 13 images.
+brew "coreutils"

.ado/apple-pr.yml

@@ -223,3 +223,22 @@ jobs:
       - template: templates/react-native-macos-init.yml
         parameters:
           configuration: $(configuration)
+
+  - job: NPMPublishDryRun
+    displayName: NPM Publish Dry Run
+    pool:
+      vmImage: $(VmImageApple)
+    timeoutInMinutes: 60 # how long to run the job before automatically cancelling
+    cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
+    steps:
+      - checkout: self # self represents the repo where the initial Pipelines YAML file was found
+        clean: true # whether to fetch clean each time
+        # fetchDepth: 2 # the depth of commits to ask Git to fetch
+        lfs: false # whether to download Git-LFS files
+        submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
+        persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch
+
+      - template: templates/apple-job-publish.yml
+        parameters:
+          build_type: 'dry-run'
+

.ado/bumpFileVersions.js

@@ -19,7 +19,7 @@ function gatherVersionInfo() {
     return {pkgJson, releaseVersion, branchVersionSuffix};
 }
 
-function updateVersionsInFiles(patchVersionPrefix) {
+function getNextVersion(patchVersionPrefix) {
 
     let {pkgJson, releaseVersion, branchVersionSuffix} = gatherVersionInfo();
 
@@ -42,34 +42,9 @@ function updateVersionsInFiles(patchVersionPrefix) {
     }
 
     pkgJson.version = releaseVersion;
-    console.log(`Bumping files to version ${releaseVersion}`);
-    execSync(`node ./scripts/set-rn-version.js --rnmpublish --to-version ${releaseVersion}`, {stdio: 'inherit', env: process.env});
 
     return {releaseVersion, branchVersionSuffix};
 }
 
-const workspaceJsonPath = path.resolve(require('os').tmpdir(), 'rnpkg.json');
-
-function removeWorkspaceConfig() {
-  let {pkgJson} = gatherVersionInfo();
-  fs.writeFileSync(workspaceJsonPath, JSON.stringify(pkgJson, null, 2));
-  delete pkgJson.private;
-  delete pkgJson.workspaces;
-  fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
-  console.log(`Removing workspace config from package.json to prepare to publish.`);
-}
-
-function restoreWorkspaceConfig() {
-  let pkgJson = JSON.parse(fs.readFileSync(workspaceJsonPath, "utf8"));
-  fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
-  console.log(`Restoring workspace config from package.json`);
-}
-
-module.exports = {
-    gatherVersionInfo,
-    publishBranchName,
-    pkgJsonPath,
-    removeWorkspaceConfig,
-    restoreWorkspaceConfig,
-    updateVersionsInFiles
-}
+const nextVersion = getNextVersion().releaseVersion;
+console.log(nextVersion);

.ado/versionUtils.js renamed to .ado/get-next-semver-version.js

@@ -1,6 +1,3 @@
-# It is expected that a `latestStableBranch` variable is set in the pipeline's settings:
-# https://dev.azure.com/office/ISS/_apps/hub/ms.vss-build-web.ci-designer-hub?pipelineId=18541
-
 # This file defines the build steps to publish a release
 name: $(Date:yyyyMMdd).$(Rev:.r)
 
@@ -9,7 +6,7 @@ trigger:
   branches:
     include:
       - main
-      - 0.68-stable
+      - '*-stable'
   paths:
     exclude:
       - package.json
@@ -25,16 +22,14 @@ variables:
 
 jobs:
   - job: RNGithubNpmJSPublish
-    displayName: React-Native GitHub Publish to npmjs.org
+    displayName: NPM Publish React-native-macos
     pool:
       vmImage: $(VmImageApple)
     variables:
       - name: BUILDSECMON_OPT_IN
         value: true
     timeoutInMinutes: 90 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
-    dependsOn:
-      - Compliance
     steps:
       - checkout: self # self represents the repo where the initial Pipelines YAML file was found
         clean: true # whether to fetch clean each time
@@ -43,54 +38,21 @@ jobs:
         submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch
 
-      - script: exit 1
-        displayName: Validate variables
-        condition: eq(variables.latestStableBranch, '')
-
-      - bash: echo "##vso[task.setvariable variable=npmDistTag]latest"
-        displayName: Set dist-tag to latest
-        condition: eq(variables['Build.SourceBranchName'], variables.latestStableBranch)
-
-      - bash: echo "##vso[task.setvariable variable=npmDistTag]canary"
-        displayName: Set dist-tag to canary
-        condition: eq(variables['Build.SourceBranchName'], 'main')
-
-      - bash: echo "##vso[task.setvariable variable=npmDistTag]v${{variables['Build.SourceBranchName']}}"
-        displayName: Set dist-tag to v0.x-stable
-        condition: and(ne(variables['Build.SourceBranchName'], 'main'), ne(variables['Build.SourceBranchName'], variables.latestStableBranch))
-
-      - template: templates/apple-tools-setup.yml
-
-      - task: CmdLine@2
-        displayName: yarn install
-        inputs:
-          script: yarn install --frozen-lockfile
-
-      - task: CmdLine@2
-        displayName: Bump stable package version
-        inputs:
-          script: node .ado/bumpFileVersions.js
-        condition: and(succeeded(), ne(variables['Build.SourceBranchName'], 'main'))
-
-      - task: CmdLine@2
-        displayName: pod update React-TurboModuleCxx-RNW
-        inputs:
-          script: |
-            cd packages/rn-tester
-            pod update React-TurboModuleCxx-RNW
-        condition: and(succeeded(), ne(variables['Build.SourceBranchName'], 'main'))
-
-      - task: CmdLine@2
-        displayName: Set canary package version
-        inputs:
-          script: node scripts/set-rn-version.js --nightly --autogenerateVersionNumber
-        condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'main'))
-
-      # Publish will fail if package.json is marked as private
-      - task: CmdLine@2
-        displayName: Remove workspace config from package.json
-        inputs:
-          script: node .ado/removeWorkspaceConfig.js
+      - ${{ if eq(variables['isMain'], true) }}:
+        - template: templates/apple-job-publish.yml
+          parameters:
+            build_type: nightly
+      - ${{ elseif eq(variables['isReleaseBranch'], true) }}:
+        - template: templates/apple-job-publish.yml
+          parameters:
+            build_type: release
+      - ${{ else }}:
+        - task: CmdLine@2
+          displayName: Unknown branch, skipping publish
+          inputs:
+            script: |
+              echo "Skipping publish for branch $(Build.SourceBranchName)"
+              exit 1
 
       - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
         displayName: 📒 Generate Manifest
@@ -103,29 +65,8 @@ jobs:
           artifactName: SBom-RNGithubNpmJSPublish-$(System.JobAttempt)
           targetPath: $(System.DefaultWorkingDirectory)/_manifest
 
-      - script: npm publish --tag $(npmDistTag) --registry https://registry.npmjs.org/ --//registry.npmjs.org/:_authToken=$(npmAuthToken)
-        displayName: Publish react-native-macos to npmjs.org
-
-      # Put the private flag back so that the removal does not get committed by the tag release step
-      - task: CmdLine@2
-        displayName: Restore package.json workspace config
-        inputs:
-          script: node .ado/restoreWorkspaceConfig.js
-
-      - task: CmdLine@2
-        displayName: 'Tag published release'
-        inputs:
-          script: node .ado/gitTagRelease.js
-        env:
-          BUILD_STAGINGDIRECTORY: $(Build.StagingDirectory)
-          BUILD_SOURCEBRANCH: $(Build.SourceBranch)
-          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-          githubApiToken: $(githubAuthToken)
-        condition: and(succeeded(), ne(variables['Build.SourceBranchName'], 'main'))
-
-
   - job: RNMacOSInitNpmJSPublish
-    displayName: react-native-macos-init Publish to npmjs.org
+    displayName: NPM Publish react-native-macos-init
     pool: cxeiss-ubuntu-20-04-large
     timeoutInMinutes: 90 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
@@ -140,17 +81,12 @@ jobs:
         submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch
 
-      - template: templates/configure-git.yml
+      - template: templates/apple-install-dependencies.yml
 
-      - task: CmdLine@2
-        displayName: yarn install
-        inputs:
-          script: |
-            cd packages/react-native-macos-init
-            yarn install --frozen-lockfile
+      - template: templates/apple-release-setup.yml
 
       - task: CmdLine@2
-        displayName: yarn build
+        displayName: Build react-native-macos-init
         inputs:
           script: |
             cd packages/react-native-macos-init

.ado/gitTagRelease.js

@@ -0,0 +1,12 @@
+steps:
+  - task: CmdLine@2
+    displayName: yarn install
+    inputs:
+      script: yarn install --frozen-lockfile
+
+  - task: CmdLine@2
+    displayName: bundle install
+    inputs:
+      script: |
+        cd packages/rn-tester
+        bundle install

.ado/publish.yml

@@ -0,0 +1,57 @@
+parameters:
+  build_type: ''
+
+steps:
+  - template: apple-tools-setup.yml
+
+  - template: apple-install-dependencies.yml
+
+  # Only set up our release environment if we're not doing a dry run
+  - ${{ if ne( parameters['build_type'], 'dry-run') }}:
+    - template: apple-release-setup.yml  
+
+  - task: CmdLine@2
+    displayName: Set build type to ${{parameters.build_type}}
+    inputs:
+      script: |
+        BUILD_TYPE=${{parameters.build_type}}
+        echo "Set build type: $BUILD_TYPE"
+
+  # Extra steps needed for *-stable releases
+  - ${{ if eq( parameters['build_type'], 'release') }}:
+    - task: CmdLine@2
+      displayName: Set next version
+      inputs:
+        script: |
+          VERSION=$(node .ado/get-next-semver-version.js)
+          echo "Set version: $VERSION"
+
+    - task: CmdLine@2
+      displayName: Set build type to ${{parameters.build_type}}
+      inputs:
+        script: |
+          BUILD_TYPE=release
+          echo "Set build type: $BUILD_TYPE"
+
+    - task: CmdLine@2
+      displayName: Set latest tag
+      inputs:
+        script: |
+          LATEST=true
+          echo "Set latest to: $LATEST"
+
+    - task: CmdLine@2
+      displayName: Prepare and tag package for release
+      inputs:
+        script: |
+          if [[ -z "$VERSION" ]]; then
+            VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | head -1)
+            echo "Using the version from the package.json: $VERSION"
+          fi
+          node ./scripts/prepare-package-for-release.js -v "$VERSION" -l $LATEST
+
+  - task: CmdLine@2
+    displayName: NPM Publish
+    inputs:
+      script: |
+        node ./scripts/publish-npm.js --${{ parameters.build_type }}