From d967bbc0d8545f95163d5d99b637ddf831a75b76 Mon Sep 17 00:00:00 2001
From: Zack Tanner <1939140+ztanner@users.noreply.github.com>
Date: Tue, 3 Sep 2024 18:20:42 -0700
Subject: [PATCH] ensure e2e tests workflow doesnt skip postinstall

---
 .github/workflows/build_reusable.yml          | 9 ++++++---
 .github/workflows/test_e2e_deploy_release.yml | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml
index fb4b0b6ea07c6..74f38822ca9a0 100644
--- a/.github/workflows/build_reusable.yml
+++ b/.github/workflows/build_reusable.yml
@@ -21,6 +21,10 @@ on:
         required: false
         description: 'whether to skip building native modules'
         type: string
+      skipNativeInstall:
+        required: false
+        description: 'whether to skip native postinstall script'
+        type: string
       uploadAnalyzerArtifacts:
         required: false
         description: 'whether to upload analyzer artifacts'
@@ -71,9 +75,8 @@ env:
   TURBO_TEAM: 'vercel'
   TURBO_REMOTE_ONLY: 'true'
   NEXT_TELEMETRY_DISABLED: 1
-  # we build a dev binary for use in CI so skip downloading
-  # canary next-swc binaries in the monorepo
-  NEXT_SKIP_NATIVE_POSTINSTALL: 1
+  # allow not skipping install-native postinstall script if we don't have a binary available already
+  NEXT_SKIP_NATIVE_POSTINSTALL: ${{ inputs.skipNativeInstall != 'yes' && 'true' || '' }}
   DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
   NEXT_JUNIT_TEST_REPORT: 'true'
   DD_ENV: 'ci'
diff --git a/.github/workflows/test_e2e_deploy_release.yml b/.github/workflows/test_e2e_deploy_release.yml
index 0d1a5a6f6468b..441979ae97617 100644
--- a/.github/workflows/test_e2e_deploy_release.yml
+++ b/.github/workflows/test_e2e_deploy_release.yml
@@ -54,8 +54,10 @@ jobs:
         NEXT_TEST_SWC_PACKAGE_NAME="@next/swc-linux-x64-gnu"
         NEXT_TEST_SWC_PACKAGE_VERSION="https://vercel-packages.vercel.app/next/commits/${{ github.sha }}/@next/swc-linux-x64-gnu"
         NEXT_EXTERNAL_TESTS_FILTERS="test/deploy-tests-manifest.json"
+        NEXT_TEST_CONTINUE_ON_ERROR="1"
         node run-tests.js --timings -g ${{ matrix.group }} -c 2 --type e2e
       skipNativeBuild: 'yes'
+      skipNativeInstall: 'yes'
       stepName: 'test-deploy-${{ matrix.group }}'
       timeout_minutes: 180
       runs_on_labels: '["ubuntu-latest"]'