Cancel workflow runs which get superseded automatically

[rails.git] / .github / workflows / tests.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 174b6b0d4b5144978d770d949e832821cd9d396d..1c82d20aeef4010e0b556713aa6079485d6e2ea6 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,33 +2,36 @@ name: Tests
 on:
   - push
   - pull_request
 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:
 jobs:
   test:
     name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
     strategy:
       matrix:

-        ubuntu: [18.04, 20.04]
-        ruby: [2.5, 2.7, 3.0]
+        ubuntu: [20.04]
+        ruby: [2.7, 3.0]

     runs-on: ubuntu-${{ matrix.ubuntu }}
     env:
       RAILS_ENV: test
       OPENSTREETMAP_MEMCACHE_SERVERS: 127.0.0.1
     steps:
     - name: Checkout source
     runs-on: ubuntu-${{ matrix.ubuntu }}
     env:
       RAILS_ENV: test
       OPENSTREETMAP_MEMCACHE_SERVERS: 127.0.0.1
     steps:
     - name: Checkout source

-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v3

     - name: Setup ruby
       uses: actions/setup-ruby@v1.1.3
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Cache gems
     - name: Setup ruby
       uses: actions/setup-ruby@v1.1.3
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Cache gems

-      uses: actions/cache@v2.1.5
+      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
       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@v3

       with:
         path: node_modules
         key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }}
       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
     - 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
     - name: Install gems
       run: |
         gem install bundler


@@ -68,7 +71,7 @@ jobs:
     - name: Run tests
       run: bundle exec rails test:all
     - name: Report completion to Coveralls
     - name: Run tests
       run: bundle exec rails test:all
     - name: Report completion to Coveralls

-      uses: coverallsapp/github-action@v1.1.2
+      uses: coverallsapp/github-action@1.1.3

       with:
         github-token: ${{ secrets.github_token }}
         flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}
       with:
         github-token: ${{ secrets.github_token }}
         flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}


@@ -79,7 +82,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Report completion to Coveralls
     runs-on: ubuntu-latest
     steps:
     - name: Report completion to Coveralls

-      uses: coverallsapp/github-action@v1.1.2
+      uses: coverallsapp/github-action@1.1.3

       with:
         github-token: ${{ secrets.github_token }}
         parallel-finished: true
       with:
         github-token: ${{ secrets.github_token }}
         parallel-finished: true