From 38214b6fb5aee3985115054ba70d89a648fa9572 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 11:41:21 +0300 Subject: [PATCH 01/12] Enable corepack after instalation --- scripts/update-package-json.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index 1b66eb985a..0cbe635a51 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -1,6 +1,7 @@ # expects `$repo`, `$tagPrefix` and `$packages` (array) variables to be defined, see e.g. update-javascript.sh npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed +corepack enable # Enable corepack after installation monorepoRoot="$(dirname "$0")/.." From 65ef417bdf0d9df2663995410b2fab366b36d176 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 11:42:50 +0300 Subject: [PATCH 02/12] Temp: enable on PRs for testing --- .github/workflows/update-deps.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index c34d114f7f..422c047650 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -8,6 +8,7 @@ on: push: branches: - main + pull_request: jobs: android: From 82e6e9756f96b0b9c0c8eda9171ef60267ceac2c Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 11:51:25 +0300 Subject: [PATCH 03/12] Enable corepack --- .github/workflows/buildandtest.yml | 28 ++++++++++++++----- .github/workflows/codegen.yml | 4 ++- .github/workflows/e2e.yml | 12 ++++++-- .github/workflows/native-tests.yml | 4 ++- .github/workflows/release.yml | 4 ++- .github/workflows/sample-application-expo.yml | 4 ++- .github/workflows/sample-application.yml | 8 ++++-- .github/workflows/testflight.yml | 4 ++- samples/expo/package.json | 2 +- 9 files changed, 52 insertions(+), 18 deletions(-) diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index 7da3d56afc..7ee238fda6 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -23,7 +23,9 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -41,7 +43,9 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -59,7 +63,9 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -82,7 +88,9 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -125,7 +133,9 @@ jobs: YARN_ENABLE_IMMUTABLE_INSTALLS: false steps: - uses: actions/checkout@v4 - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -155,7 +165,9 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -189,7 +201,9 @@ jobs: dev: [true, false] steps: - uses: actions/checkout@v4 - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml index 9520480de2..5f8d66895d 100644 --- a/.github/workflows/codegen.yml +++ b/.github/workflows/codegen.yml @@ -37,7 +37,9 @@ jobs: --targetPlatform ios steps: - uses: actions/checkout@v4 - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ad23834a18..ae90c417e7 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -56,7 +56,9 @@ jobs: - run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer if: ${{ matrix.platform == 'ios' }} - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -227,7 +229,9 @@ jobs: - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer if: ${{ matrix.platform == 'ios' }} - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -353,7 +357,9 @@ jobs: path: dev-packages/e2e-tests - name: Enable Corepack - run: npm i -g corepack + run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 20 diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml index afaa4909ff..ea269a1778 100644 --- a/.github/workflows/native-tests.yml +++ b/.github/workflows/native-tests.yml @@ -25,7 +25,9 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: npm i -g corepack + run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e5668ec397..b8cf468f10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,9 @@ jobs: with: token: ${{ steps.token.outputs.token }} fetch-depth: 0 - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/sample-application-expo.yml b/.github/workflows/sample-application-expo.yml index 5830f3e5fd..8c7f061a90 100644 --- a/.github/workflows/sample-application-expo.yml +++ b/.github/workflows/sample-application-expo.yml @@ -47,7 +47,9 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: npm i -g corepack + run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml index c24599fd37..e6b45b8478 100644 --- a/.github/workflows/sample-application.yml +++ b/.github/workflows/sample-application.yml @@ -61,7 +61,9 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: npm i -g corepack + run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -261,7 +263,9 @@ jobs: run: unzip ${{ env.ANDROID_APP_ARCHIVE_PATH }} - name: Enable Corepack - run: npm i -g corepack + run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml index 06bba8da11..ccfe682b5f 100644 --- a/.github/workflows/testflight.yml +++ b/.github/workflows/testflight.yml @@ -26,7 +26,9 @@ jobs: ruby-version: '3.3.0' # based on what is used in the sample bundler-cache: true # runs 'bundle install' and caches installed gems automatically cache-version: 1 # cache the installed gems - - run: npm i -g corepack + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/samples/expo/package.json b/samples/expo/package.json index b30a1a38a1..ba5f9b120c 100644 --- a/samples/expo/package.json +++ b/samples/expo/package.json @@ -14,7 +14,7 @@ "export:web": "expo export --dump-sourcemap --clear --platform web", "prebuild": "expo prebuild --clean --no-install", "set-version": "npx react-native-version --skip-tag --never-amend", - "eas-build-pre-install": "npm i -g corepack && yarn install --no-immutable --inline-builds && yarn workspace @sentry/react-native build" + "eas-build-pre-install": "npm i -g corepack && corepack enable && yarn install --no-immutable --inline-builds && yarn workspace @sentry/react-native build" }, "dependencies": { "@sentry/react-native": "6.11.0-beta.0", From 61b5c6c9a3daec687d922352760e7ebbc3435456 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 11:54:11 +0300 Subject: [PATCH 04/12] Test with enable corepack --- .github/workflows/buildandtest.yml | 28 +++++-------------- .github/workflows/codegen.yml | 4 +-- .github/workflows/e2e.yml | 12 ++------ .github/workflows/native-tests.yml | 4 +-- .github/workflows/release.yml | 4 +-- .github/workflows/sample-application-expo.yml | 4 +-- .github/workflows/sample-application.yml | 8 ++---- .github/workflows/testflight.yml | 4 +-- samples/expo/package.json | 2 +- scripts/update-package-json.sh | 2 +- 10 files changed, 19 insertions(+), 53 deletions(-) diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index 7ee238fda6..182341bc60 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -23,9 +23,7 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -43,9 +41,7 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -63,9 +59,7 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -88,9 +82,7 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -133,9 +125,7 @@ jobs: YARN_ENABLE_IMMUTABLE_INSTALLS: false steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -165,9 +155,7 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -201,9 +189,7 @@ jobs: dev: [true, false] steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml index 5f8d66895d..f642eb97ba 100644 --- a/.github/workflows/codegen.yml +++ b/.github/workflows/codegen.yml @@ -37,9 +37,7 @@ jobs: --targetPlatform ios steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ae90c417e7..8ba647370a 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -56,9 +56,7 @@ jobs: - run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer if: ${{ matrix.platform == 'ios' }} - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -229,9 +227,7 @@ jobs: - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer if: ${{ matrix.platform == 'ios' }} - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -357,9 +353,7 @@ jobs: path: dev-packages/e2e-tests - name: Enable Corepack - run: | - npm i -g corepack - corepack enable + run: corepack enable - uses: actions/setup-node@v4 with: node-version: 20 diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml index ea269a1778..b549019a0d 100644 --- a/.github/workflows/native-tests.yml +++ b/.github/workflows/native-tests.yml @@ -25,9 +25,7 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: | - npm i -g corepack - corepack enable + run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b8cf468f10..507167d292 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,9 +28,7 @@ jobs: with: token: ${{ steps.token.outputs.token }} fetch-depth: 0 - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/sample-application-expo.yml b/.github/workflows/sample-application-expo.yml index 8c7f061a90..3a2fdd45b0 100644 --- a/.github/workflows/sample-application-expo.yml +++ b/.github/workflows/sample-application-expo.yml @@ -47,9 +47,7 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: | - npm i -g corepack - corepack enable + run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml index e6b45b8478..f6cf0eda21 100644 --- a/.github/workflows/sample-application.yml +++ b/.github/workflows/sample-application.yml @@ -61,9 +61,7 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: | - npm i -g corepack - corepack enable + run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -263,9 +261,7 @@ jobs: run: unzip ${{ env.ANDROID_APP_ARCHIVE_PATH }} - name: Enable Corepack - run: | - npm i -g corepack - corepack enable + run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml index ccfe682b5f..d458d7aee3 100644 --- a/.github/workflows/testflight.yml +++ b/.github/workflows/testflight.yml @@ -26,9 +26,7 @@ jobs: ruby-version: '3.3.0' # based on what is used in the sample bundler-cache: true # runs 'bundle install' and caches installed gems automatically cache-version: 1 # cache the installed gems - - run: | - npm i -g corepack - corepack enable + - run: corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/samples/expo/package.json b/samples/expo/package.json index ba5f9b120c..b30a1a38a1 100644 --- a/samples/expo/package.json +++ b/samples/expo/package.json @@ -14,7 +14,7 @@ "export:web": "expo export --dump-sourcemap --clear --platform web", "prebuild": "expo prebuild --clean --no-install", "set-version": "npx react-native-version --skip-tag --never-amend", - "eas-build-pre-install": "npm i -g corepack && corepack enable && yarn install --no-immutable --inline-builds && yarn workspace @sentry/react-native build" + "eas-build-pre-install": "npm i -g corepack && yarn install --no-immutable --inline-builds && yarn workspace @sentry/react-native build" }, "dependencies": { "@sentry/react-native": "6.11.0-beta.0", diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index 0cbe635a51..07630e071d 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -1,6 +1,6 @@ # expects `$repo`, `$tagPrefix` and `$packages` (array) variables to be defined, see e.g. update-javascript.sh -npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed +# npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed corepack enable # Enable corepack after installation monorepoRoot="$(dirname "$0")/.." From 73241b10e9cb5c68446b042b6c4d0e2ee517a96e Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 11:56:35 +0300 Subject: [PATCH 05/12] Revert "Test with enable corepack" This reverts commit 61b5c6c9a3daec687d922352760e7ebbc3435456. --- .github/workflows/buildandtest.yml | 28 ++++++++++++++----- .github/workflows/codegen.yml | 4 ++- .github/workflows/e2e.yml | 12 ++++++-- .github/workflows/native-tests.yml | 4 ++- .github/workflows/release.yml | 4 ++- .github/workflows/sample-application-expo.yml | 4 ++- .github/workflows/sample-application.yml | 8 ++++-- .github/workflows/testflight.yml | 4 ++- samples/expo/package.json | 2 +- scripts/update-package-json.sh | 2 +- 10 files changed, 53 insertions(+), 19 deletions(-) diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index 182341bc60..7ee238fda6 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -23,7 +23,9 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -41,7 +43,9 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -59,7 +63,9 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -82,7 +88,9 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -125,7 +133,9 @@ jobs: YARN_ENABLE_IMMUTABLE_INSTALLS: false steps: - uses: actions/checkout@v4 - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -155,7 +165,9 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -189,7 +201,9 @@ jobs: dev: [true, false] steps: - uses: actions/checkout@v4 - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml index f642eb97ba..5f8d66895d 100644 --- a/.github/workflows/codegen.yml +++ b/.github/workflows/codegen.yml @@ -37,7 +37,9 @@ jobs: --targetPlatform ios steps: - uses: actions/checkout@v4 - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 8ba647370a..ae90c417e7 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -56,7 +56,9 @@ jobs: - run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer if: ${{ matrix.platform == 'ios' }} - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -227,7 +229,9 @@ jobs: - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer if: ${{ matrix.platform == 'ios' }} - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -353,7 +357,9 @@ jobs: path: dev-packages/e2e-tests - name: Enable Corepack - run: corepack enable + run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 20 diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml index b549019a0d..ea269a1778 100644 --- a/.github/workflows/native-tests.yml +++ b/.github/workflows/native-tests.yml @@ -25,7 +25,9 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: corepack enable + run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 507167d292..b8cf468f10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,9 @@ jobs: with: token: ${{ steps.token.outputs.token }} fetch-depth: 0 - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/sample-application-expo.yml b/.github/workflows/sample-application-expo.yml index 3a2fdd45b0..8c7f061a90 100644 --- a/.github/workflows/sample-application-expo.yml +++ b/.github/workflows/sample-application-expo.yml @@ -47,7 +47,9 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: corepack enable + run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml index f6cf0eda21..e6b45b8478 100644 --- a/.github/workflows/sample-application.yml +++ b/.github/workflows/sample-application.yml @@ -61,7 +61,9 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: corepack enable + run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 @@ -261,7 +263,9 @@ jobs: run: unzip ${{ env.ANDROID_APP_ARCHIVE_PATH }} - name: Enable Corepack - run: corepack enable + run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml index d458d7aee3..ccfe682b5f 100644 --- a/.github/workflows/testflight.yml +++ b/.github/workflows/testflight.yml @@ -26,7 +26,9 @@ jobs: ruby-version: '3.3.0' # based on what is used in the sample bundler-cache: true # runs 'bundle install' and caches installed gems automatically cache-version: 1 # cache the installed gems - - run: corepack enable + - run: | + npm i -g corepack + corepack enable - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/samples/expo/package.json b/samples/expo/package.json index b30a1a38a1..ba5f9b120c 100644 --- a/samples/expo/package.json +++ b/samples/expo/package.json @@ -14,7 +14,7 @@ "export:web": "expo export --dump-sourcemap --clear --platform web", "prebuild": "expo prebuild --clean --no-install", "set-version": "npx react-native-version --skip-tag --never-amend", - "eas-build-pre-install": "npm i -g corepack && yarn install --no-immutable --inline-builds && yarn workspace @sentry/react-native build" + "eas-build-pre-install": "npm i -g corepack && corepack enable && yarn install --no-immutable --inline-builds && yarn workspace @sentry/react-native build" }, "dependencies": { "@sentry/react-native": "6.11.0-beta.0", diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index 07630e071d..0cbe635a51 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -1,6 +1,6 @@ # expects `$repo`, `$tagPrefix` and `$packages` (array) variables to be defined, see e.g. update-javascript.sh -# npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed +npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed corepack enable # Enable corepack after installation monorepoRoot="$(dirname "$0")/.." From e9944069547b8f141b2d95ee2f9d78970ca7b322 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 11:56:45 +0300 Subject: [PATCH 06/12] Revert "Enable corepack" This reverts commit 82e6e9756f96b0b9c0c8eda9171ef60267ceac2c. --- .github/workflows/buildandtest.yml | 28 +++++-------------- .github/workflows/codegen.yml | 4 +-- .github/workflows/e2e.yml | 12 ++------ .github/workflows/native-tests.yml | 4 +-- .github/workflows/release.yml | 4 +-- .github/workflows/sample-application-expo.yml | 4 +-- .github/workflows/sample-application.yml | 8 ++---- .github/workflows/testflight.yml | 4 +-- samples/expo/package.json | 2 +- 9 files changed, 18 insertions(+), 52 deletions(-) diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index 7ee238fda6..7da3d56afc 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -23,9 +23,7 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 @@ -43,9 +41,7 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 @@ -63,9 +59,7 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 @@ -88,9 +82,7 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 @@ -133,9 +125,7 @@ jobs: YARN_ENABLE_IMMUTABLE_INSTALLS: false steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 @@ -165,9 +155,7 @@ jobs: if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 @@ -201,9 +189,7 @@ jobs: dev: [true, false] steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml index 5f8d66895d..9520480de2 100644 --- a/.github/workflows/codegen.yml +++ b/.github/workflows/codegen.yml @@ -37,9 +37,7 @@ jobs: --targetPlatform ios steps: - uses: actions/checkout@v4 - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ae90c417e7..ad23834a18 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -56,9 +56,7 @@ jobs: - run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer if: ${{ matrix.platform == 'ios' }} - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 @@ -229,9 +227,7 @@ jobs: - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer if: ${{ matrix.platform == 'ios' }} - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 @@ -357,9 +353,7 @@ jobs: path: dev-packages/e2e-tests - name: Enable Corepack - run: | - npm i -g corepack - corepack enable + run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 20 diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml index ea269a1778..afaa4909ff 100644 --- a/.github/workflows/native-tests.yml +++ b/.github/workflows/native-tests.yml @@ -25,9 +25,7 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: | - npm i -g corepack - corepack enable + run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b8cf468f10..e5668ec397 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,9 +28,7 @@ jobs: with: token: ${{ steps.token.outputs.token }} fetch-depth: 0 - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/sample-application-expo.yml b/.github/workflows/sample-application-expo.yml index 8c7f061a90..5830f3e5fd 100644 --- a/.github/workflows/sample-application-expo.yml +++ b/.github/workflows/sample-application-expo.yml @@ -47,9 +47,7 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: | - npm i -g corepack - corepack enable + run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml index e6b45b8478..c24599fd37 100644 --- a/.github/workflows/sample-application.yml +++ b/.github/workflows/sample-application.yml @@ -61,9 +61,7 @@ jobs: - uses: actions/checkout@v4 - name: Enable Corepack - run: | - npm i -g corepack - corepack enable + run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 @@ -263,9 +261,7 @@ jobs: run: unzip ${{ env.ANDROID_APP_ARCHIVE_PATH }} - name: Enable Corepack - run: | - npm i -g corepack - corepack enable + run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml index ccfe682b5f..06bba8da11 100644 --- a/.github/workflows/testflight.yml +++ b/.github/workflows/testflight.yml @@ -26,9 +26,7 @@ jobs: ruby-version: '3.3.0' # based on what is used in the sample bundler-cache: true # runs 'bundle install' and caches installed gems automatically cache-version: 1 # cache the installed gems - - run: | - npm i -g corepack - corepack enable + - run: npm i -g corepack - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/samples/expo/package.json b/samples/expo/package.json index ba5f9b120c..b30a1a38a1 100644 --- a/samples/expo/package.json +++ b/samples/expo/package.json @@ -14,7 +14,7 @@ "export:web": "expo export --dump-sourcemap --clear --platform web", "prebuild": "expo prebuild --clean --no-install", "set-version": "npx react-native-version --skip-tag --never-amend", - "eas-build-pre-install": "npm i -g corepack && corepack enable && yarn install --no-immutable --inline-builds && yarn workspace @sentry/react-native build" + "eas-build-pre-install": "npm i -g corepack && yarn install --no-immutable --inline-builds && yarn workspace @sentry/react-native build" }, "dependencies": { "@sentry/react-native": "6.11.0-beta.0", From a1f8b61d2576448dfca4c590257347f039c5a5a4 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 11:57:38 +0300 Subject: [PATCH 07/12] Only enable in update-package --- scripts/update-package-json.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index 0cbe635a51..ffa9effa82 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -1,6 +1,6 @@ # expects `$repo`, `$tagPrefix` and `$packages` (array) variables to be defined, see e.g. update-javascript.sh -npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed +#npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed corepack enable # Enable corepack after installation monorepoRoot="$(dirname "$0")/.." From f445df7dce7924fcdefe7c853eeb3256ae86aeab Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 12:06:51 +0300 Subject: [PATCH 08/12] Print corepack version --- scripts/update-package-json.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index ffa9effa82..af09bc14b4 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -1,6 +1,7 @@ # expects `$repo`, `$tagPrefix` and `$packages` (array) variables to be defined, see e.g. update-javascript.sh -#npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed +npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed +corepack --version corepack enable # Enable corepack after installation monorepoRoot="$(dirname "$0")/.." From 70161e81b462196a766eff74d7b4fdaefde1d33f Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 12:07:43 +0300 Subject: [PATCH 09/12] do not install globally --- scripts/update-package-json.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index af09bc14b4..a3cc9967f4 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -1,8 +1,8 @@ # expects `$repo`, `$tagPrefix` and `$packages` (array) variables to be defined, see e.g. update-javascript.sh -npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed -corepack --version +#npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed corepack enable # Enable corepack after installation +corepack --version monorepoRoot="$(dirname "$0")/.." From e0d12ef965b64c05595cebb8d240ccded6482840 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 12:14:28 +0300 Subject: [PATCH 10/12] Just enable corepack in update-package-json.sh script --- scripts/update-package-json.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index a3cc9967f4..686bda6af5 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -1,8 +1,6 @@ # expects `$repo`, `$tagPrefix` and `$packages` (array) variables to be defined, see e.g. update-javascript.sh -#npm i -g corepack # This repository uses Yarn v3 which requires corepack to be installed -corepack enable # Enable corepack after installation -corepack --version +corepack enable # This repository uses Yarn v3 which requires corepack to be enabled monorepoRoot="$(dirname "$0")/.." From 1a8d2d54cd3ded26a55e678c7b65158241bb8aee Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 12:22:23 +0300 Subject: [PATCH 11/12] Revert "Temp: enable on PRs for testing" This reverts commit 65ef417bdf0d9df2663995410b2fab366b36d176. --- .github/workflows/update-deps.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 422c047650..c34d114f7f 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -8,7 +8,6 @@ on: push: branches: - main - pull_request: jobs: android: From 51ac3556c28d606577b96c84ca5d4667c3aa5e66 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Tue, 15 Apr 2025 16:59:36 +0300 Subject: [PATCH 12/12] Add comment explaining the revert and future steps --- scripts/update-package-json.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index 686bda6af5..d89cd70125 100755 --- a/scripts/update-package-json.sh +++ b/scripts/update-package-json.sh @@ -1,5 +1,7 @@ # expects `$repo`, `$tagPrefix` and `$packages` (array) variables to be defined, see e.g. update-javascript.sh +# Since Corepack is not going to be distributed with Node.js v25+ in the future we need to install Corepack globally. +# See: https://github.com/getsentry/sentry-react-native/pull/4741 corepack enable # This repository uses Yarn v3 which requires corepack to be enabled monorepoRoot="$(dirname "$0")/.."