X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7e5cbe87ed37f9cba8224fa4049047d7f981f66a..fb9219a52fdc3160358c4ffa8bbe26cd817b007c:/.github/workflows/tests.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c1fa68072..702f29264 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,15 +3,15 @@ on:
   - push
   - pull_request
 concurrency:
-  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 jobs:
   test:
     name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
-        ubuntu: [20.04]
-        ruby: [2.7, 3.0]
+        ubuntu: [20.04, 22.04]
+        ruby: [2.7, 3.0, 3.1]
     runs-on: ubuntu-${{ matrix.ubuntu }}
     env:
       RAILS_ENV: test
@@ -40,8 +40,6 @@ jobs:
         sudo systemctl start postgresql
         sudo -u postgres createuser -s $(id -un)
         createdb openstreetmap
-        psql -c "CREATE EXTENSION btree_gist" openstreetmap
-        psql -f db/functions/functions.sql openstreetmap
     - name: Configure rails
       run: |
         cp config/github.database.yml config/database.yml
@@ -50,13 +48,13 @@ jobs:
     - name: Populate database
       run: |
         sed -f script/normalise-structure db/structure.sql > db/structure.expected
-        bundle exec rake db:migrate
+        bundle exec rails db:migrate
         sed -f script/normalise-structure db/structure.sql > db/structure.actual
         diff -uw db/structure.expected db/structure.actual
     - name: Export javascript strings
-      run: bundle exec rake i18n:js:export
+      run: bundle exec rails i18n:js:export
     - name: Install node modules
-      run: bundle exec rake yarn:install
+      run: bundle exec rails yarn:install
     - name: Run tests
       run: bundle exec rails test:all
     - name: Report completion to Coveralls