From: Tom Hughes <tom@compton.nu>
Date: Fri, 28 May 2021 06:27:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3209'
X-Git-Tag: live~2359
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d9a8ac42aa58d567bcf098496b823e0f7e92ceac?hp=ad485536a3e00aeccc8d3849583f75cabeaaddc3

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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f452d8445..aa9de33e2 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.5
+      uses: actions/cache@v2.1.6
       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.5
+      uses: actions/cache@v2.1.6
       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.5
+      uses: actions/cache@v2.1.6
       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.5
+      uses: actions/cache@v2.1.6
       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.5
+      uses: actions/cache@v2.1.6
       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 174b6b0d4..e818884ae 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.5
+      uses: actions/cache@v2.1.6
       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.5
+      uses: actions/cache@v2.1.6
       with:
         path: node_modules
         key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }}