X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f5095fe3bd749c43f805056f661f06386acdeebb..a9befc74e409c947b7818ce0c469605aba762bed:/.github/workflows/tests.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2b9dae62e..d1cf73eae 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,12 +7,11 @@ concurrency:
   cancel-in-progress: true
 jobs:
   test:
-    name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
+    name: Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
-        ubuntu: [20.04, 22.04]
-        ruby: ['3.0', '3.1']
-    runs-on: ubuntu-${{ matrix.ubuntu }}
+        ruby: ['3.1', '3.2', '3.3', '3.4']
+    runs-on: ubuntu-latest
     env:
       RAILS_ENV: test
       OPENSTREETMAP_MEMCACHE_SERVERS: 127.0.0.1
@@ -23,14 +22,12 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        rubygems: 3.4.10
         bundler-cache: true
     - name: Cache node modules
-      uses: actions/cache@v3
+      uses: actions/setup-node@v4
       with:
-        path: node_modules
-        key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }}
-        restore-keys: |
-          yarn-ubuntu-${{ matrix.ubuntu }}-
+        cache: yarn
     - name: Install packages
       run: |
         sudo apt-get -yqq update
@@ -57,13 +54,17 @@ jobs:
       run: bundle exec bin/yarn install
     - name: Compile assets
       run: bundle exec rails assets:precompile
+    - name: Create tmp/pids directory
+      run: mkdir -p tmp/pids
     - name: Run tests
       run: bundle exec rails test:all
+    - name: Run javascript tests
+      run: bundle exec teaspoon
     - name: Report completion to Coveralls
-      uses: coverallsapp/github-action@v2.2.2
+      uses: coverallsapp/github-action@v2.3.6
       with:
         github-token: ${{ secrets.github_token }}
-        flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}
+        flag-name: ruby-${{ matrix.ruby }}
         format: lcov
         parallel: true
   finish:
@@ -72,7 +73,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Report completion to Coveralls
-      uses: coverallsapp/github-action@v2.2.2
+      uses: coverallsapp/github-action@v2.3.6
       with:
         github-token: ${{ secrets.github_token }}
         parallel-finished: true