From b50de0bf6335af63912e761e4d456ed6e66e7301 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 15 Oct 2024 13:52:26 +0200 Subject: [PATCH 1/8] fix(ci): enable corepack for updater jobs --- .github/workflows/update-deps.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 70701930fc..516ea80f8b 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -8,9 +8,11 @@ on: push: branches: - main + pull_request: #tmp for testing jobs: android: + run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-android.sh @@ -20,6 +22,7 @@ jobs: api-token: ${{ secrets.CI_DEPLOY_KEY }} cocoa: + run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-cocoa.sh @@ -29,6 +32,7 @@ jobs: api-token: ${{ secrets.CI_DEPLOY_KEY }} javascript: + run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-javascript.sh @@ -38,6 +42,7 @@ jobs: api-token: ${{ secrets.CI_DEPLOY_KEY }} wizard: + run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-wizard.sh @@ -48,6 +53,7 @@ jobs: api-token: ${{ secrets.CI_DEPLOY_KEY }} cli: + run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-cli.sh @@ -57,6 +63,7 @@ jobs: api-token: ${{ secrets.CI_DEPLOY_KEY }} sample-rn: + run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-rn.sh From d9ea20f389f8a7f3e6a14c4f84bb6858ca641734 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 15 Oct 2024 13:54:31 +0200 Subject: [PATCH 2/8] tmp for testing --- .github/workflows/update-deps.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 516ea80f8b..5951fc7f85 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -9,6 +9,8 @@ on: branches: - main pull_request: #tmp for testing + branches: + - main jobs: android: From 5490ab73591dfefbc29e9ae96e2b75263f4d2d92 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 15 Oct 2024 14:06:01 +0200 Subject: [PATCH 3/8] tmp --- .github/workflows/update-deps.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 5951fc7f85..445e911cab 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -8,9 +8,7 @@ on: push: branches: - main - pull_request: #tmp for testing - branches: - - main + pull_request: jobs: android: From f5a2b6455d3e62070d54078b36fa718c8b66fe02 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 15 Oct 2024 14:06:40 +0200 Subject: [PATCH 4/8] tmp --- .github/workflows/update-deps.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 445e911cab..b23cc8b88d 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -1,13 +1,6 @@ name: Update Dependencies on: - # Run every day. - schedule: - - cron: '0 3 * * *' - # And on on every PR merge so we get the updated dependencies ASAP, and to make sure the changelog doesn't conflict. - push: - branches: - - main pull_request: jobs: From d2cd0bc1a7c4cee09917dabc199fdbaf4d929863 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 15 Oct 2024 14:09:32 +0200 Subject: [PATCH 5/8] return on --- .github/workflows/update-deps.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index b23cc8b88d..516ea80f8b 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -1,7 +1,14 @@ name: Update Dependencies on: - pull_request: + # Run every day. + schedule: + - cron: '0 3 * * *' + # And on on every PR merge so we get the updated dependencies ASAP, and to make sure the changelog doesn't conflict. + push: + branches: + - main + pull_request: #tmp for testing jobs: android: From e0bef6cfc80a8aa84d4d5c6af44deca6bbe341da Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 15 Oct 2024 14:15:11 +0200 Subject: [PATCH 6/8] enable corepack in local scripts --- .github/workflows/update-deps.yml | 6 ------ scripts/update-javascript.sh | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 516ea80f8b..1785bc46e8 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -12,7 +12,6 @@ on: jobs: android: - run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-android.sh @@ -22,7 +21,6 @@ jobs: api-token: ${{ secrets.CI_DEPLOY_KEY }} cocoa: - run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-cocoa.sh @@ -32,7 +30,6 @@ jobs: api-token: ${{ secrets.CI_DEPLOY_KEY }} javascript: - run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-javascript.sh @@ -42,7 +39,6 @@ jobs: api-token: ${{ secrets.CI_DEPLOY_KEY }} wizard: - run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-wizard.sh @@ -53,7 +49,6 @@ jobs: api-token: ${{ secrets.CI_DEPLOY_KEY }} cli: - run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-cli.sh @@ -63,7 +58,6 @@ jobs: api-token: ${{ secrets.CI_DEPLOY_KEY }} sample-rn: - run: corepack enable uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: path: scripts/update-rn.sh diff --git a/scripts/update-javascript.sh b/scripts/update-javascript.sh index a9cd10b23a..3259088b86 100755 --- a/scripts/update-javascript.sh +++ b/scripts/update-javascript.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -euo pipefail +corepack enable # This repository uses Yarn v3 which requires corepack to be enabled + tagPrefix='' repo="https://github.com/getsentry/sentry-javascript.git" packages=('@sentry/browser' '@sentry/core' '@sentry/react' '@sentry/types' '@sentry/utils' '@sentry-internal/typescript') From 6625020e90345a14c5811503364fbd4d7a039dd3 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 15 Oct 2024 14:16:49 +0200 Subject: [PATCH 7/8] move corepack to common script for js updates --- scripts/update-javascript.sh | 2 -- scripts/update-package-json.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update-javascript.sh b/scripts/update-javascript.sh index 3259088b86..a9cd10b23a 100755 --- a/scripts/update-javascript.sh +++ b/scripts/update-javascript.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash set -euo pipefail -corepack enable # This repository uses Yarn v3 which requires corepack to be enabled - tagPrefix='' repo="https://github.com/getsentry/sentry-javascript.git" packages=('@sentry/browser' '@sentry/core' '@sentry/react' '@sentry/types' '@sentry/utils' '@sentry-internal/typescript') diff --git a/scripts/update-package-json.sh b/scripts/update-package-json.sh index f6c47fb23e..686bda6af5 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 +corepack enable # This repository uses Yarn v3 which requires corepack to be enabled + monorepoRoot="$(dirname "$0")/.." case $1 in From 656bce61aeac07bb3adbeb39b45d34bc445757db Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 15 Oct 2024 14:22:19 +0200 Subject: [PATCH 8/8] remove on pr runs --- .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 1785bc46e8..70701930fc 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -8,7 +8,6 @@ on: push: branches: - main - pull_request: #tmp for testing jobs: android: