From 787e692c41b7146493e45d725e499e327c62641e Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Wed, 25 Oct 2023 15:15:30 +0000 Subject: [PATCH 1/4] ci(e2e): Restore nxcache in e2e tests --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66b282202f5e..8eb402434acd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -817,6 +817,13 @@ jobs: uses: ./.github/actions/restore-cache env: DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }} + - name: NX cache + uses: actions/cache/restore@v3 + with: + path: .nxcache + key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }} + # On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it + restore-keys: ${{ env.NX_CACHE_RESTORE_KEYS }} - name: Check tarball cache uses: actions/cache@v3 with: From 7abe4bf1f5244ec529641cc13739dd191e98e539 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Wed, 25 Oct 2023 15:20:26 +0000 Subject: [PATCH 2/4] Only save --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8eb402434acd..53c7b783ea18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -825,7 +825,7 @@ jobs: # On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it restore-keys: ${{ env.NX_CACHE_RESTORE_KEYS }} - name: Check tarball cache - uses: actions/cache@v3 + uses: actions/cache/save@v3 with: path: ${{ github.workspace }}/packages/*/*.tgz key: ${{ env.BUILD_CACHE_TARBALL_KEY }} From 6f144c50df720dd848428fdc050ecd62291b9f1b Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Wed, 25 Oct 2023 15:32:28 +0000 Subject: [PATCH 3/4] hm. --- .github/workflows/build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53c7b783ea18..6925f2385444 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -813,10 +813,6 @@ jobs: uses: actions/setup-node@v3 with: node-version-file: 'package.json' - - name: Restore caches - uses: ./.github/actions/restore-cache - env: - DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }} - name: NX cache uses: actions/cache/restore@v3 with: @@ -824,13 +820,13 @@ jobs: key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }} # On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it restore-keys: ${{ env.NX_CACHE_RESTORE_KEYS }} + - name: Build tarballs + run: yarn build:tarball - name: Check tarball cache uses: actions/cache/save@v3 with: path: ${{ github.workspace }}/packages/*/*.tgz key: ${{ env.BUILD_CACHE_TARBALL_KEY }} - - name: Build tarballs - run: yarn build:tarball job_e2e_tests: name: E2E ${{ matrix.label || matrix.test-application }} Test From 5a8f5ed86935358f23a357650321f8094e46f4bd Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Wed, 25 Oct 2023 15:51:54 +0000 Subject: [PATCH 4/4] hm hm hm --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6925f2385444..806bfd4edc2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -813,6 +813,10 @@ jobs: uses: actions/setup-node@v3 with: node-version-file: 'package.json' + - name: Restore caches + uses: ./.github/actions/restore-cache + env: + DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }} - name: NX cache uses: actions/cache/restore@v3 with: @@ -822,7 +826,7 @@ jobs: restore-keys: ${{ env.NX_CACHE_RESTORE_KEYS }} - name: Build tarballs run: yarn build:tarball - - name: Check tarball cache + - name: Stores tarballs in cache uses: actions/cache/save@v3 with: path: ${{ github.workspace }}/packages/*/*.tgz