From deea7f3011c6168f08d4c63502e701693f2ebdb2 Mon Sep 17 00:00:00 2001 From: David Hadka Date: Sun, 31 May 2020 21:41:03 -0500 Subject: [PATCH 1/2] Delete cache folders prior to restore in tests --- .github/workflows/cache-tests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cache-tests.yml b/.github/workflows/cache-tests.yml index 10120ddc46..f108894bf8 100644 --- a/.github/workflows/cache-tests.yml +++ b/.github/workflows/cache-tests.yml @@ -58,6 +58,11 @@ jobs: run: | node -e "Promise.resolve(require('./packages/cache/lib/cache').saveCache(['test-cache','~/test-cache'],'test-${{ runner.os }}-${{ github.run_id }}'))" + - name: Delete cache folders prior to restore + run: | + rm -rf test-cache + rm -rf ~/test-cache + - name: Restore cache using restoreCache() run: | node -e "Promise.resolve(require('./packages/cache/lib/cache').restoreCache(['test-cache','~/test-cache'],'test-${{ runner.os }}-${{ github.run_id }}'))" @@ -66,4 +71,4 @@ jobs: shell: bash run: | packages/cache/__tests__/verify-cache-files.sh ${{ runner.os }} test-cache - packages/cache/__tests__/verify-cache-files.sh ${{ runner.os }} ~/test-cache \ No newline at end of file + packages/cache/__tests__/verify-cache-files.sh ${{ runner.os }} ~/test-cache From b2d75900970eeaa17fa1aec64683ac65848db843 Mon Sep 17 00:00:00 2001 From: David Hadka Date: Sun, 31 May 2020 21:49:28 -0500 Subject: [PATCH 2/2] Update cache-tests.yml --- .github/workflows/cache-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cache-tests.yml b/.github/workflows/cache-tests.yml index f108894bf8..1ac811ea27 100644 --- a/.github/workflows/cache-tests.yml +++ b/.github/workflows/cache-tests.yml @@ -59,6 +59,7 @@ jobs: node -e "Promise.resolve(require('./packages/cache/lib/cache').saveCache(['test-cache','~/test-cache'],'test-${{ runner.os }}-${{ github.run_id }}'))" - name: Delete cache folders prior to restore + shell: bash run: | rm -rf test-cache rm -rf ~/test-cache