Merge remote-tracking branch 'upstream/pull/5694'

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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f01b44bb7f264da842df7c5910fef0a5bec57369..d1cf73eaefc7d239a7fe5af072007ee702f3d236 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,30 +7,27 @@ concurrency:
   cancel-in-progress: true
 jobs:
   test:
   cancel-in-progress: true
 jobs:
   test:

-    name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
+    name: Ruby ${{ matrix.ruby }}

     strategy:
       matrix:
     strategy:
       matrix:

-        ubuntu: [20.04, 22.04]
-        ruby: ['2.7', '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
     steps:
     - name: Checkout source
     env:
       RAILS_ENV: test
       OPENSTREETMAP_MEMCACHE_SERVERS: 127.0.0.1
     steps:
     - name: Checkout source

-      uses: actions/checkout@v3
+      uses: actions/checkout@v4

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

+        rubygems: 3.4.10

         bundler-cache: true
     - name: Cache node modules
         bundler-cache: true
     - name: Cache node modules

-      uses: actions/cache@v3
+      uses: actions/setup-node@v4

       with:
       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
     - name: Install packages
       run: |
         sudo apt-get -yqq update


@@ -54,16 +51,21 @@ jobs:
     - name: Export javascript strings
       run: bundle exec rails i18n:js:export
     - name: Install node modules
     - name: Export javascript strings
       run: bundle exec rails i18n:js:export
     - name: Install node modules

-      run: bundle exec rails yarn:install
+      run: bundle exec bin/yarn install

     - name: Compile assets
       run: bundle exec rails assets:precompile
     - 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 tests
       run: bundle exec rails test:all

+    - name: Run javascript tests
+      run: bundle exec teaspoon

     - name: Report completion to Coveralls
     - name: Report completion to Coveralls

-      uses: coverallsapp/github-action@1.1.3
+      uses: coverallsapp/github-action@v2.3.6

       with:
         github-token: ${{ secrets.github_token }}
       with:
         github-token: ${{ secrets.github_token }}

-        flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}
+        flag-name: ruby-${{ matrix.ruby }}
+        format: lcov

         parallel: true
   finish:
     name: Finalise
         parallel: true
   finish:
     name: Finalise


@@ -71,7 +73,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@1.1.3
+      uses: coverallsapp/github-action@v2.3.6

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