Cherry-pick "Refactor Publish pipeline (take 2)"

Saadnajmi · Saadnajmi · commit 43d5236982c6 · 2023-04-03T18:18:53.000-07:00
diff --git a/.ado/apple-pr.yml b/.ado/apple-pr.yml
@@ -238,37 +238,7 @@ 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/apple-tools-setup.yml
-
-      - template: templates/apple-install-dependencies.yml
-
-      - task: CmdLine@2
-        displayName: Set next version if release branch
-        inputs:
-          script: |
-            VERSION=$(node .ado/get-next-semver-version.js)
-            echo "Set Version to: $VERSION"
-        condition: and(succeeded(), ne(variables['Build.TargetBranchName'], 'main'))
-
-
-      - task: CmdLine@2
-        displayName: Prepare 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 false --dry-run true
-
-      - task: CmdLine@2
-        displayName: NPM Publish Dry Run
-        inputs:
-          script: |
-            node ./scripts/publish-npm.js --dry-run
+      - template: templates/apple-job-publish.yml
+        parameters:
+          build_type: 'dry-run'
 
-      - task: CmdLine@2
-        displayName: Print tarball output
-        inputs:
-          script: |
-            npm publish --dry-run
diff --git a/.ado/publish.yml b/.ado/publish.yml
@@ -21,8 +21,8 @@ variables:
     value: production,externalfacing
 
 jobs:
-  - job: NPMPublishRNM
-    displayName: NPM Publish React Native macOS
+  - job: RNGithubNpmJSPublish
+    displayName: NPM Publish React-native-macos
     pool:
       vmImage: $(VmImageApple)
     variables:
@@ -38,74 +38,35 @@ 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/apple-tools-setup.yml
-
-      - template: templates/apple-install-dependencies.yml
-
-      - template: templates/apple-release-setup.yml
-
-      - task: CmdLine@2
-        displayName: Set next version if release branch
-        inputs:
-          script: |
-            VERSION=$(node .ado/get-next-semver-version.js)
-            echo "Set version to: $VERSION"
-        condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'))
-  
-      - task: CmdLine@2
-        displayName: Set latest tag if latest stable branch
-        inputs:
-          script: |
-            LATEST=true
-            echo "Set latest to: $LATEST"
-        condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'))
-
-      - task: CmdLine@2
-        displayName: Set release type to 'nightly'
-        inputs:
-          script: |
-            RELEASE_TYPE=nightly
-            echo "Set release type to: $RELEASE_TYPE"
-        condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
-  
-      - task: CmdLine@2
-        displayName: Set release type to 'release'
-        inputs:
-          script: |
-            RELEASE_TYPE=release
-            echo "Set release type to: $RELEASE_TYPE"
-        condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'))
-
-      - task: CmdLine@2
-        displayName: Prepare 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
-        condition: and(succeeded(), ne(variables['Build.TargetBranch'], 'refs/heads/main'))
+      - ${{ 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
         inputs:
           BuildDropPath: $(System.DefaultWorkingDirectory)
 
-      - task: CmdLine@2
-        displayName: NPM Publish
-        inputs:
-          script: |
-            node ./scripts/publish-npm.js --$RELEASE_TYPE
-
       - task: PublishPipelineArtifact@1
         displayName: 📒 Publish Manifest
         inputs:
           artifactName: SBom-RNGithubNpmJSPublish-$(System.JobAttempt)
           targetPath: $(System.DefaultWorkingDirectory)/_manifest
 
   - 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
@@ -120,8 +81,6 @@ 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/apple-tools-setup.yml
-
       - template: templates/apple-install-dependencies.yml
 
       - template: templates/apple-release-setup.yml
diff --git a/.ado/templates/apple-job-publish.yml b/.ado/templates/apple-job-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 }}
diff --git a/.ado/variables/vars.yml b/.ado/variables/vars.yml
@@ -2,4 +2,5 @@ variables:
   VmImageApple: internal-macos12
   slice_name: 'Xcode_14.2'
   xcode_version: '/Applications/Xcode_14.2.app'
-  latest_stable_branch: '0.71-stable'
+  isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
+  isReleaseBranch: $[endsWith(variables['Build.SourceBranchName'], '-stable')]
diff --git a/scripts/prepare-package-for-release.js b/scripts/prepare-package-for-release.js
@@ -22,6 +22,7 @@ const {echo, exec, exit} = require('shelljs');
 const yargs = require('yargs');
 const {isReleaseBranch, parseVersion} = require('./version-utils');
 const {failIfTagExists} = require('./release-utils');
+const {getBranchName} = require('./scm-utils'); // [macOS]
 
 const argv = yargs
   .option('r', {
@@ -44,11 +45,7 @@ const argv = yargs
     default: false,
   }).argv;
 
-// [macOS Use git to get the branch name, rather than relying on CircleCI env vars.
-const branch = exec('git rev-parse --abbrev-ref HEAD', {
-  silent: true,
-}).stdout.trim();
-// // macOS]
+const branch = getBranchName(); // [macOS] Don't rely on CircleCI environment variables.
 const remote = argv.remote;
 const releaseVersion = argv.toVersion;
 const isLatest = argv.latest;
diff --git a/scripts/publish-npm.js b/scripts/publish-npm.js
@@ -52,8 +52,7 @@ const os = require('os');
 const path = require('path');
 const yargs = require('yargs');
 
-// [macOS] Use git to get the tag name, rather than relying on CircleCI environment variables.
-const buildTag = exec('git tag --points-at HEAD');
+const buildTag = exec('git tag --points-at HEAD'); // [macOS] Don't rely on CircleCI environment variables.
 const otp = process.env.NPM_CONFIG_OTP;
 const tmpPublishingFolder = fs.mkdtempSync(
   path.join(os.tmpdir(), 'rn-publish-'),
@@ -105,7 +104,7 @@ const rawVersion =
     nightlyBuild
     ? '0.0.0'
     : // For pre-release and stable releases, we use the git tag of the version we're releasing (set in set-rn-version)
-      buildTag.substring(0, str.indexOf('-microsft')); // [macOS] Strip off the "-microsoft" suffix from the tag name.
+      buildTag.substring(0, buildTag.indexOf('-microsft')); // [macOS] Strip off the "-microsoft" suffix from the tag name.
 
 let version,
   major,
