Merge branch 'main' into fix/update-dev-fatal-error-codemod

redwoodjs · Mar 17, 2022 · a3fcc2a · a3fcc2a
2 parents e290c27 + 7c48e3d
commit a3fcc2a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/build-eslint-jest.yaml b/.github/workflows/build-eslint-jest.yaml
@@ -34,9 +34,9 @@ jobs:
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: yarn-${{ hashFiles('yarn.lock') }}
+          key: yarn-1234-${{ hashFiles('yarn.lock') }} #change yarn-{randomString} to bust the cache
           restore-keys: |
-            yarn-
+            yarn-1234
 
       - name: Install dependencies
         run: yarn install --immutable

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -27,10 +27,6 @@ jobs:
       - name: Tune linux network
         run: sudo ethtool -K eth0 tx off rx off
 
-      # uncomment for hard reset if cache causing problems
-      - name: Clear Yarn Global Cache
-        run: yarn cache clean --all
-
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -40,9 +36,9 @@ jobs:
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: yarn-${{ hashFiles('yarn.lock') }}
+          key: yarn-1234-${{ hashFiles('yarn.lock') }} #change yarn-{randomString} to bust the cache
           restore-keys: |
-            yarn-
+            yarn-1234
 
       - name: Install dependencies
         run: yarn install --immutable

diff --git a/.github/workflows/publish-npm-canary.yaml b/.github/workflows/publish-npm-canary.yaml
@@ -33,9 +33,9 @@ jobs:
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: yarn-${{ hashFiles('yarn.lock') }}
+          key: yarn-1234-${{ hashFiles('yarn.lock') }} #change yarn-{randomString} to bust the cache
           restore-keys: |
-            yarn-
+            yarn-1234
 
       - name: Install dependencies
         run: yarn install --immutable

diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml
@@ -36,9 +36,9 @@ jobs:
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: yarn-${{ hashFiles('yarn.lock') }}
+          key: yarn-1234-${{ hashFiles('yarn.lock') }} #change yarn-{randomString} to bust the cache
           restore-keys: |
-            yarn-
+            yarn-1234
 
       - name: Install framework dependencies
         run: |