Fix post-release recovery failures

Author: cipolleschi

.github/workflows/bump-podfile-lock.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   bump-podfile-lock:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Checkout
         uses: actions/checkout@v6

.github/workflows/create-draft-release.yml

@@ -9,6 +9,9 @@ on:
       checkoutRef:
         required: false
         type: string
+      releaseId:
+        required: false
+        type: string
       hermesVersion:
         required: false
         type: string
@@ -37,6 +40,7 @@ jobs:
           git config --local user.email "bot@reactnative.dev"
           git config --local user.name "React Native Bot"
       - name: Create draft release
+        if: inputs.releaseId == ''
         uses: actions/github-script@v8
         id: create-draft-release
         with:
@@ -49,7 +53,7 @@ jobs:
       - name: Upload release assets for DotSlash
         uses: actions/github-script@v8
         env:
-          RELEASE_ID: ${{ steps.create-draft-release.outputs.result }}
+          RELEASE_ID: ${{ inputs.releaseId || steps.create-draft-release.outputs.result }}
         with:
           script: |
             const {uploadReleaseAssetsForDotSlashFiles} = require('./scripts/releases/upload-release-assets-for-dotslash.js');

.github/workflows/publish-npm.yml

@@ -28,6 +28,10 @@ on:
         description: Tag whose successful publish needs post-release recovery
         required: false
         type: string
+      draft-release-id:
+        description: Existing draft release ID when resuming post-release recovery
+        required: false
+        type: string
   # nightly build @ 2:15 AM UTC
   schedule:
     - cron: '15 2 * * *'
@@ -48,6 +52,7 @@ jobs:
       - id: mode
         env:
           RECOVERY_RELEASE_TAG: ${{ inputs.release-tag }}
+          RECOVERY_DRAFT_RELEASE_ID: ${{ inputs.draft-release-id }}
         run: |
           if [[ "${{ github.ref_type }}" == "tag" ]]; then
             echo "mode=release" >> $GITHUB_OUTPUT
@@ -58,6 +63,10 @@ jobs:
               echo "Invalid release tag: $RECOVERY_RELEASE_TAG" >&2
               exit 1
             fi
+            if [[ -n "$RECOVERY_DRAFT_RELEASE_ID" && ! "$RECOVERY_DRAFT_RELEASE_ID" =~ ^[0-9]+$ ]]; then
+              echo "Invalid draft release ID: $RECOVERY_DRAFT_RELEASE_ID" >&2
+              exit 1
+            fi
             echo "mode=post-release" >> $GITHUB_OUTPUT
             echo "release-type=" >> $GITHUB_OUTPUT
             echo "release-tag=$RECOVERY_RELEASE_TAG" >> $GITHUB_OUTPUT
@@ -234,7 +243,7 @@ jobs:
       always() &&
       needs.determine_mode.result == 'success' &&
       ((needs.determine_mode.outputs.mode == 'release' && needs.publish_react_native.result == 'success') ||
-       needs.determine_mode.outputs.mode == 'post-release')
+       (needs.determine_mode.outputs.mode == 'post-release' && inputs.draft-release-id == ''))
     env:
       REACT_NATIVE_BOT_GITHUB_TOKEN: ${{ secrets.REACT_NATIVE_BOT_GITHUB_TOKEN }}
     steps:
@@ -294,7 +303,7 @@ jobs:
       always() &&
       needs.determine_mode.result == 'success' &&
       ((needs.determine_mode.outputs.mode == 'release' && needs.publish_react_native.result == 'success') ||
-       needs.determine_mode.outputs.mode == 'post-release')
+       (needs.determine_mode.outputs.mode == 'post-release' && inputs.draft-release-id == ''))
     uses: ./.github/workflows/generate-changelog.yml
     secrets: inherit
     with:
@@ -319,13 +328,15 @@ jobs:
     if: |
       always() &&
       needs.determine_mode.result == 'success' &&
-      needs.generate_changelog.result == 'success' &&
       needs.set_hermes_versions.result == 'success' &&
-      (needs.determine_mode.outputs.mode == 'release' || needs.determine_mode.outputs.mode == 'post-release')
+      ((needs.determine_mode.outputs.mode == 'release' && needs.generate_changelog.result == 'success') ||
+       (needs.determine_mode.outputs.mode == 'post-release' &&
+        (needs.generate_changelog.result == 'success' || inputs.draft-release-id != '')))
     uses: ./.github/workflows/create-draft-release.yml
     secrets: inherit
     with:
       releaseVersion: ${{ needs.determine_mode.outputs.release-tag }}
       checkoutRef: ${{ needs.determine_mode.outputs.release-tag }}
+      releaseId: ${{ inputs.draft-release-id }}
       hermesVersion: ${{ needs.set_hermes_versions.outputs.HERMES_VERSION }}
       hermesV1Version: ${{ needs.set_hermes_versions.outputs.HERMES_V1_VERSION }}

scripts/releases/__tests__/__snapshots__/upload-release-assets-for-dotslash-test.js.snap

@@ -28,7 +28,7 @@ Array [
   Array [
     Object {
       "asset_id": "1",
-      "owner": "facebook",
+      "owner": "react",
       "repo": "react-native",
     },
   ],
@@ -47,7 +47,7 @@ Array [
         "content-type": "text/plain",
       },
       "name": "test.tar.gz",
-      "owner": "facebook",
+      "owner": "react",
       "release_id": "1",
       "repo": "react-native",
     },
@@ -114,7 +114,7 @@ Array [
         "content-type": "text/plain",
       },
       "name": "test.tar.gz",
-      "owner": "facebook",
+      "owner": "react",
       "release_id": "1",
       "repo": "react-native",
     },
@@ -194,7 +194,7 @@ Array [
         "content-type": "text/plain",
       },
       "name": "test.tar.gz",
-      "owner": "facebook",
+      "owner": "react",
       "release_id": "1",
       "repo": "react-native",
     },

scripts/releases/upload-release-assets-for-dotslash.js

@@ -25,6 +25,10 @@ const nullthrows = require('nullthrows');
 const path = require('path');
 const {parseArgs} = require('util');
 
+// Upload POSTs are not preserved when GitHub redirects from the former owner.
+const GITHUB_OWNER = 'react';
+const GITHUB_REPO = 'react-native';
+
 /*::
 import type {DotSlashProvider, DotSlashHttpProvider, DotSlashArtifactInfo} from './utils/dotslash-utils';
 import type {IOctokit} from './utils/octokit-utils';
@@ -138,8 +142,8 @@ async function getReleaseAssetMap(
   octokit /*: IOctokit */,
 ) /*: Promise<ReleaseAssetMap> */ {
   const existingAssets = await octokit.repos.listReleaseAssets({
-    owner: 'facebook',
-    repo: 'react-native',
+    owner: GITHUB_OWNER,
+    repo: GITHUB_REPO,
     release_id: releaseId,
   });
   return new Map(existingAssets.data.map(asset => [asset.name, asset]));
@@ -305,8 +309,8 @@ async function maybeDeleteExistingReleaseAsset(
   }
   console.log(`[${name}] Deleting existing release asset...`);
   await octokit.repos.deleteReleaseAsset({
-    owner: 'facebook',
-    repo: 'react-native',
+    owner: GITHUB_OWNER,
+    repo: GITHUB_REPO,
     asset_id: existingAsset.id,
   });
 }
@@ -360,8 +364,8 @@ async function uploadAndVerifyReleaseAsset(
   const {
     data: {browser_download_url},
   } = await octokit.repos.uploadReleaseAsset({
-    owner: 'facebook',
-    repo: 'react-native',
+    owner: GITHUB_OWNER,
+    repo: GITHUB_REPO,
     release_id: releaseId,
     name,
     data,