X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6903aa96b11dc294c9c68d83f1a40028e1eea224..d90bbff3464e46b4094aa702a86eb054057234bd:/.github/workflows/tests.yml?ds=sidebyside

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2d272c718..79811c612 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,6 +2,9 @@ name: Tests
 on:
   - push
   - pull_request
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 jobs:
   test:
     name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
@@ -17,16 +20,10 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v3
     - name: Setup ruby
-      uses: actions/setup-ruby@v1.1.3
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Cache gems
-      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 }}-
+        bundler-cache: true
     - name: Cache node modules
       uses: actions/cache@v3
       with:
@@ -38,11 +35,6 @@ jobs:
       run: |
         sudo apt-get -yqq update
         sudo apt-get -yqq install memcached libvips-dev
-    - name: Install gems
-      run: |
-        gem install bundler
-        bundle config set deployment true
-        bundle install --jobs 4 --retry 3
     - name: Create database
       run: |
         sudo systemctl start postgresql