Merge pull request #26295 from Expensify/Rory-FixCPChecklistUpdates

Update checklist for cherry-picked PRs

.github/actions/javascript/createOrUpdateStagingDeploy/index.js

@@ -207,10 +207,7 @@ function fetchTag(tag) {
         console.log(`Running command: ${command}`);
         execSync(command);
     } catch (e) {
-        // This can happen if the tag was only created locally but does not exist in the remote. In this case, we'll fetch history of the staging branch instead
-        const command = `git fetch origin staging --no-tags --shallow-exclude=${previousPatchVersion}`;
-        console.log(`Running command: ${command}`);
-        execSync(command);
+        console.error(e);
     }
 }
 
@@ -301,13 +298,14 @@ function getValidMergedPRs(commits) {
  * @returns {Promise<Array<Number>>} – Pull request numbers
  */
 function getPullRequestsMergedBetween(fromTag, toTag) {
+    console.log(`Looking for commits made between ${fromTag} and ${toTag}...`);
     return getCommitHistoryAsJSON(fromTag, toTag).then((commitList) => {
         console.log(`Commits made between ${fromTag} and ${toTag}:`, commitList);
 
         // Find which commit messages correspond to merged PR's
         const pullRequestNumbers = getValidMergedPRs(commitList);
         console.log(`List of pull requests merged between ${fromTag} and ${toTag}`, pullRequestNumbers);
-        return pullRequestNumbers;
+        return _.map(pullRequestNumbers, (prNum) => Number.parseInt(prNum, 10));
     });
 }
 

.github/actions/javascript/getDeployPullRequestList/index.js

@@ -170,10 +170,7 @@ function fetchTag(tag) {
         console.log(`Running command: ${command}`);
         execSync(command);
     } catch (e) {
-        // This can happen if the tag was only created locally but does not exist in the remote. In this case, we'll fetch history of the staging branch instead
-        const command = `git fetch origin staging --no-tags --shallow-exclude=${previousPatchVersion}`;
-        console.log(`Running command: ${command}`);
-        execSync(command);
+        console.error(e);
     }
 }
 
@@ -264,13 +261,14 @@ function getValidMergedPRs(commits) {
  * @returns {Promise<Array<Number>>} – Pull request numbers
  */
 function getPullRequestsMergedBetween(fromTag, toTag) {
+    console.log(`Looking for commits made between ${fromTag} and ${toTag}...`);
     return getCommitHistoryAsJSON(fromTag, toTag).then((commitList) => {
         console.log(`Commits made between ${fromTag} and ${toTag}:`, commitList);
 
         // Find which commit messages correspond to merged PR's
         const pullRequestNumbers = getValidMergedPRs(commitList);
         console.log(`List of pull requests merged between ${fromTag} and ${toTag}`, pullRequestNumbers);
-        return pullRequestNumbers;
+        return _.map(pullRequestNumbers, (prNum) => Number.parseInt(prNum, 10));
     });
 }
 

.github/libs/GitUtils.js

@@ -22,10 +22,7 @@ function fetchTag(tag) {
         console.log(`Running command: ${command}`);
         execSync(command);
     } catch (e) {
-        // This can happen if the tag was only created locally but does not exist in the remote. In this case, we'll fetch history of the staging branch instead
-        const command = `git fetch origin staging --no-tags --shallow-exclude=${previousPatchVersion}`;
-        console.log(`Running command: ${command}`);
-        execSync(command);
+        console.error(e);
     }
 }
 
@@ -116,13 +113,14 @@ function getValidMergedPRs(commits) {
  * @returns {Promise<Array<Number>>} – Pull request numbers
  */
 function getPullRequestsMergedBetween(fromTag, toTag) {
+    console.log(`Looking for commits made between ${fromTag} and ${toTag}...`);
     return getCommitHistoryAsJSON(fromTag, toTag).then((commitList) => {
         console.log(`Commits made between ${fromTag} and ${toTag}:`, commitList);
 
         // Find which commit messages correspond to merged PR's
         const pullRequestNumbers = getValidMergedPRs(commitList);
         console.log(`List of pull requests merged between ${fromTag} and ${toTag}`, pullRequestNumbers);
-        return pullRequestNumbers;
+        return _.map(pullRequestNumbers, (prNum) => Number.parseInt(prNum, 10));
     });
 }
 

.github/workflows/finishReleaseCycle.yml

@@ -119,31 +119,3 @@ jobs:
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-  # Create a new StagingDeployCash for the next release cycle.
-  createNewStagingDeployCash:
-    runs-on: ubuntu-latest
-    needs: [updateStaging, createNewPatchVersion]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: staging
-          token: ${{ secrets.OS_BOTIFY_TOKEN }}
-
-        # Create a local git tag so that GitUtils.getPullRequestsMergedBetween can use `git log` to generate a
-        # list of pull requests that were merged between this version tag and another.
-        # NOTE: This tag is only used locally and shouldn't be pushed to the remote.
-        # If it was pushed, that would trigger the staging deploy which is handled in a separate workflow (deploy.yml)
-      - name: Tag version
-        run: git tag ${{ needs.createNewPatchVersion.outputs.NEW_VERSION }}
-
-      - name: Create new StagingDeployCash
-        uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main
-        with:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
-          NPM_VERSION: ${{ needs.createNewPatchVersion.outputs.NEW_VERSION }}
-
-      - if: ${{ failure() }}
-        uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
-        with:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/platformDeploy.yml

@@ -28,6 +28,25 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 
+  # Note: we're updating the checklist before running the deploys and assuming that it will succeed on at least one platform
+  deployChecklist:
+    name: Create or update deploy checklist
+    runs-on: ubuntu-latest
+    needs: validateActor
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Expensify/App/.github/actions/composite/setupNode@main
+
+      - name: Set version
+        id: getVersion
+        run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
+
+      - name: Create or update staging deploy
+        uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main
+        with:
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          NPM_VERSION: ${{ steps.getVersion.outputs.VERSION }}
+
   android:
     name: Build and deploy Android
     needs: validateActor

.github/workflows/preDeploy.yml

@@ -98,25 +98,6 @@ jobs:
           # Force-update the remote staging branch
           git push --force origin staging
 
-      # Create a local git tag on staging so that GitUtils.getPullRequestsMergedBetween can use `git log` to generate a
-      # list of pull requests that were merged between this version tag and another.
-      # NOTE: This tag is only used locally and shouldn't be pushed to the remote.
-      # If it was pushed, that would trigger the staging deploy which is handled in a separate workflow (deploy.yml)
-      - name: Tag staging
-        run: git tag ${{ needs.createNewVersion.outputs.NEW_VERSION }}
-
-      - name: Update StagingDeployCash
-        uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main
-        with:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
-          NPM_VERSION: ${{ needs.createNewVersion.outputs.NEW_VERSION }}
-
-      - name: Find open StagingDeployCash
-        id: getStagingDeployCash
-        run: echo "STAGING_DEPLOY_CASH=$(gh issue list --label StagingDeployCash --json number --jq '.[0].number')" >> "$GITHUB_OUTPUT"
-        env:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
-
       - if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with: