From 5ba0710e921b6ec07067336c24c8a3d6ebd0fe31 Mon Sep 17 00:00:00 2001 From: Janka Uryga Date: Wed, 4 Sep 2024 15:29:27 +0200 Subject: [PATCH] ci: make inputs.skipNativeInstall do what it says (#69674) ...instead of doing the opposite before this PR: - `skipNativeInstall: 'yes'` sets `NEXT_SKIP_NATIVE_POSTINSTALL=''` - `skipNativeInstall: 'no'` sets `NEXT_SKIP_NATIVE_POSTINSTALL=true` after this PR: - `skipNativeInstall: 'yes'` sets `NEXT_SKIP_NATIVE_POSTINSTALL='1'` - `skipNativeInstall: 'no'` sets `NEXT_SKIP_NATIVE_POSTINSTALL=''` --- .github/workflows/build_reusable.yml | 3 ++- .github/workflows/test_e2e_deploy_release.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml index 74f38822ca9a08..46415ec38d7e3b 100644 --- a/.github/workflows/build_reusable.yml +++ b/.github/workflows/build_reusable.yml @@ -25,6 +25,7 @@ on: required: false description: 'whether to skip native postinstall script' type: string + default: 'yes' uploadAnalyzerArtifacts: required: false description: 'whether to upload analyzer artifacts' @@ -76,7 +77,7 @@ env: TURBO_REMOTE_ONLY: 'true' NEXT_TELEMETRY_DISABLED: 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' || '' }} + NEXT_SKIP_NATIVE_POSTINSTALL: ${{ inputs.skipNativeInstall == 'yes' && '1' || '' }} 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 441979ae976173..d1f1da964e241a 100644 --- a/.github/workflows/test_e2e_deploy_release.yml +++ b/.github/workflows/test_e2e_deploy_release.yml @@ -57,7 +57,7 @@ jobs: NEXT_TEST_CONTINUE_ON_ERROR="1" node run-tests.js --timings -g ${{ matrix.group }} -c 2 --type e2e skipNativeBuild: 'yes' - skipNativeInstall: 'yes' + skipNativeInstall: 'no' stepName: 'test-deploy-${{ matrix.group }}' timeout_minutes: 180 runs_on_labels: '["ubuntu-latest"]'