Workflows: Use built-in cache support in actions/setup-node (#8189)

GoogleForCreators · Jul 5, 2021 · 7ed6688 · 7ed6688
1 parent 270cc17
commit 7ed6688
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 193 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -58,20 +58,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Bundle size check
         uses: preactjs/compressed-size-action@v2
@@ -98,20 +86,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.github/workflows/deploy-storybook.yml b/.github/workflows/deploy-storybook.yml
@@ -38,20 +38,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/lint-css-js-md.yml b/.github/workflows/lint-css-js-md.yml
@@ -56,20 +56,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/lint-i18n.yml b/.github/workflows/lint-i18n.yml
@@ -56,20 +56,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.3
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.github/workflows/plugin-release.yml b/.github/workflows/plugin-release.yml
@@ -201,20 +201,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Install dependencies
         run: npm ci
@@ -302,20 +290,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -524,20 +500,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/tests-e2e.yml b/.github/workflows/tests-e2e.yml
@@ -73,20 +73,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.github/workflows/tests-karma-dashboard.yml b/.github/workflows/tests-karma-dashboard.yml
@@ -53,19 +53,7 @@ jobs:
         uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{ steps.nvm.outputs.NVMRC }}
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          cache: npm
 
       # TODO: Remove need for `npm install puppeteer`.
       - name: Install dependencies

diff --git a/.github/workflows/tests-karma-editor.yml b/.github/workflows/tests-karma-editor.yml
@@ -58,19 +58,7 @@ jobs:
         uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{ steps.nvm.outputs.NVMRC }}
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          cache: npm
 
       # TODO: Remove need for `npm install puppeteer`.
       - name: Install dependencies

diff --git a/.github/workflows/tests-unit-js.yml b/.github/workflows/tests-unit-js.yml
@@ -47,19 +47,7 @@ jobs:
         uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{ steps.nvm.outputs.NVMRC }}
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          cache: npm
 
       - name: Setup Jest cache
         uses: actions/cache@v2.1.6

diff --git a/.github/workflows/update-google-fonts.yml b/.github/workflows/update-google-fonts.yml
@@ -21,20 +21,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/update-templates.yml b/.github/workflows/update-templates.yml
@@ -21,20 +21,8 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2.2.0
         with:
-          node-version: '${{ steps.nvm.outputs.NVMRC }}'
-
-      - name: Cache node modules
-        uses: pat-s/always-upload-cache@v2.1.5
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        env:
-          cache-name: cache-node-modules
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: npm
 
       - name: Install dependencies
         run: npm ci