From: Tom Hughes <tom@compton.nu>
Date: Sun, 16 Feb 2025 15:19:14 +0000 (+0000)
Subject: Use setup-node action to install node modules
X-Git-Tag: live~23^2~1
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d1cedb86b9175a043d04febd56d7c8277c1098ab

Use setup-node action to install node modules
---

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 06f6ff841..75a1cc960 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -50,12 +50,9 @@ jobs:
         rubygems: 3.4.10
         bundler-cache: true
     - name: Cache node modules
-      uses: actions/cache@v4
+      uses: actions/setup-node@v4
       with:
-        path: node_modules
-        key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
-        restore-keys: |
-          yarn-${{ env.os }}-
+        cache: yarn
     - name: Install node modules
       run: bundle exec bin/yarn install
     - name: Create dummy database configuration
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 156ed99e7..e478cd6d8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,12 +26,9 @@ jobs:
         rubygems: 3.4.10
         bundler-cache: true
     - name: Cache node modules
-      uses: actions/cache@v4
+      uses: actions/setup-node@v4
       with:
-        path: node_modules
-        key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }}
-        restore-keys: |
-          yarn-ubuntu-${{ matrix.ubuntu }}-
+        cache: yarn
     - name: Install packages
       run: |
         sudo apt-get -yqq update