From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 May 2021 07:22:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3194'
X-Git-Tag: live~1699
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cb86e74f69c6b1fe62b06d037396976fadfa3ad8?hp=9603d718c201f603942fc4c04bbc84d52983a6e3

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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f764a804f..f452d8445 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v2.3.4
     - name: Setup ruby
-      uses: actions/setup-ruby@v1
+      uses: actions/setup-ruby@v1.1.3
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
@@ -37,7 +37,7 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v2.3.4
     - name: Setup ruby
-      uses: actions/setup-ruby@v1
+      uses: actions/setup-ruby@v1.1.3
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
@@ -61,7 +61,7 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v2.3.4
     - name: Setup ruby
-      uses: actions/setup-ruby@v1
+      uses: actions/setup-ruby@v1.1.3
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
@@ -96,7 +96,7 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v2.3.4
     - name: Setup ruby
-      uses: actions/setup-ruby@v1
+      uses: actions/setup-ruby@v1.1.3
       with:
         ruby-version: ${{ env.ruby }}
     - name: Cache gems
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 04caddf41..12a515759 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v2.3.4
     - name: Setup ruby
-      uses: actions/setup-ruby@v1
+      uses: actions/setup-ruby@v1.1.3
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Cache gems