From 7e1b4f63fce43d31c3f024ba32b108f9bfcbfda3 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Mon, 15 Jul 2024 10:10:17 +0000 Subject: [PATCH 1/4] ci: Fix canary test implosion --- .github/workflows/canary.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 9dcbd43e5547..c41fa3a878b1 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -12,13 +12,6 @@ on: env: HEAD_COMMIT: ${{ github.event.inputs.commit || github.sha }} - CACHED_BUILD_PATHS: | - ${{ github.workspace }}/packages/*/*.tgz - ${{ github.workspace }}/dev-packages/test-utils/build - ${{ github.workspace }}/node_modules - ${{ github.workspace }}/packages/*/node_modules - ${{ github.workspace }}/dev-packages/*/node_modules - permissions: contents: read issues: write @@ -37,11 +30,6 @@ jobs: uses: actions/setup-node@v4 with: node-version-file: 'package.json' - - name: Check canary cache - uses: actions/cache@v4 - with: - path: ${{ env.CACHED_BUILD_PATHS }} - key: canary-${{ env.HEAD_COMMIT }} - name: Install dependencies run: yarn install - name: Build packages @@ -110,12 +98,6 @@ jobs: with: node-version-file: 'dev-packages/e2e-tests/package.json' - - name: Restore canary cache - uses: actions/cache/restore@v4 - with: - path: ${{ env.CACHED_BUILD_PATHS }} - key: canary-${{ env.HEAD_COMMIT }} - - name: Get node version id: versions run: | From 2abacc31929d5cdc4bfc87f1bf3dc1d1b42c30e3 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Mon, 15 Jul 2024 10:59:08 +0000 Subject: [PATCH 2/4] hm --- .github/workflows/canary.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index c41fa3a878b1..00284bb73aff 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -12,6 +12,14 @@ on: env: HEAD_COMMIT: ${{ github.event.inputs.commit || github.sha }} + CACHED_BUILD_PATHS: | + ${{ github.workspace }}/packages/*/*.tgz + ${{ github.workspace }}/dev-packages/*/*.tgz + ${{ github.workspace }}/dev-packages/test-utils/build + ${{ github.workspace }}/node_modules + ${{ github.workspace }}/packages/*/node_modules + ${{ github.workspace }}/dev-packages/*/node_modules + permissions: contents: read issues: write @@ -30,6 +38,11 @@ jobs: uses: actions/setup-node@v4 with: node-version-file: 'package.json' + - name: Check canary cache + uses: actions/cache@v4 + with: + path: ${{ env.CACHED_BUILD_PATHS }} + key: canary-${{ env.HEAD_COMMIT }} - name: Install dependencies run: yarn install - name: Build packages @@ -98,6 +111,12 @@ jobs: with: node-version-file: 'dev-packages/e2e-tests/package.json' + - name: Restore canary cache + uses: actions/cache/restore@v4 + with: + path: ${{ env.CACHED_BUILD_PATHS }} + key: canary-${{ env.HEAD_COMMIT }} + - name: Get node version id: versions run: | From a76a241ea39527c767a8843387b85b62a098b2a0 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Mon, 15 Jul 2024 11:22:11 +0000 Subject: [PATCH 3/4] ? --- .github/workflows/canary.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 00284bb73aff..a09621e72cbf 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -19,6 +19,7 @@ env: ${{ github.workspace }}/node_modules ${{ github.workspace }}/packages/*/node_modules ${{ github.workspace }}/dev-packages/*/node_modules + ${{ github.workspace }}/packages/utils/build permissions: contents: read From 7eb690f79aa6fb02633f56650bcb2eeeb034e3cd Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Mon, 15 Jul 2024 11:47:32 +0000 Subject: [PATCH 4/4] undo unnecessary --- .github/workflows/canary.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index a09621e72cbf..42c1594ebc5b 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -14,7 +14,6 @@ env: CACHED_BUILD_PATHS: | ${{ github.workspace }}/packages/*/*.tgz - ${{ github.workspace }}/dev-packages/*/*.tgz ${{ github.workspace }}/dev-packages/test-utils/build ${{ github.workspace }}/node_modules ${{ github.workspace }}/packages/*/node_modules