this is better

bullet-train-co · Oct 20, 2023 · d47e1d3 · d47e1d3
1 parent 756588b
commit d47e1d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 36 deletions.
diff --git a/.github/workflows/_run_super_scaffolding_tests.yml b/.github/workflows/_run_super_scaffolding_tests.yml
@@ -58,25 +58,10 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - name: Cache yarn cache directory
-        uses: actions/cache@v3
+      - uses: actions/setup-node@v3
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Cache node_modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node-modules-
+          node-version-file: .nvmrc
+          cache: 'yarn'
 
       - name: asset cache
         uses: actions/cache@v3

diff --git a/.github/workflows/_run_tests.yml b/.github/workflows/_run_tests.yml
@@ -58,25 +58,10 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - name: Cache yarn cache directory
-        uses: actions/cache@v3
+      - uses: actions/setup-node@v3
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Cache node_modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node-modules-
+          node-version-file: .nvmrc
+          cache: 'yarn'
 
       - name: asset cache
         uses: actions/cache@v3