From: Tom Hughes <tom@compton.nu>
Date: Mon, 21 Mar 2022 23:56:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3505'
X-Git-Tag: live~2247
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7364f40fca5c87bda71f80b58c3403dcbc24fab9?hp=095187d08fd1a99f3118ded7430e317cf01adc97

Merge remote-tracking branch 'upstream/pull/3505'
---

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 27f93428c..a633a6614 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -17,7 +17,7 @@ jobs:
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3
       with:
         path: vendor/bundle
         key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
@@ -41,7 +41,7 @@ jobs:
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3
       with:
         path: vendor/bundle
         key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
@@ -65,14 +65,14 @@ jobs:
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3
       with:
         path: vendor/bundle
         key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
         restore-keys: |
           bundle-${{ env.os }}-${{ env.ruby }}-
     - name: Cache node modules
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3
       with:
         path: node_modules
         key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
@@ -100,7 +100,7 @@ jobs:
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3
       with:
         path: vendor/bundle
         key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d4a721ff6..2d272c718 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,14 +21,14 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Cache gems
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3
       with:
         path: vendor/bundle
         key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }}
         restore-keys: |
           bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-
     - name: Cache node modules
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3
       with:
         path: node_modules
         key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }}