X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1a65c279aab2b99d13dbf5909a1a05ad52648b25..c23f03d09b51be12a832b391e84bf3b2b072861c:/.github/workflows/tests.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1d7c50350..1c82d20ae 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,12 +2,15 @@ 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 }}
     strategy:
       matrix:
-        ubuntu: [18.04, 20.04]
+        ubuntu: [20.04]
         ruby: [2.7, 3.0]
     runs-on: ubuntu-${{ matrix.ubuntu }}
     env:
@@ -15,20 +18,20 @@ jobs:
       OPENSTREETMAP_MEMCACHE_SERVERS: 127.0.0.1
     steps:
     - name: Checkout source
-      uses: actions/checkout@v2.4.0
+      uses: actions/checkout@v3
     - name: Setup ruby
       uses: actions/setup-ruby@v1.1.3
       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') }}
@@ -37,7 +40,7 @@ jobs:
     - name: Install packages
       run: |
         sudo apt-get -yqq update
-        sudo apt-get -yqq install memcached
+        sudo apt-get -yqq install memcached libvips-dev
     - name: Install gems
       run: |
         gem install bundler