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

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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 73ce90b9272239d132db2d7cf6f21ed01e288224..25722c1f48fc471abd09f8a6b2dfb2dbe8704bc1 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,22 +10,23 @@ jobs:
     name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
     name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }}
     strategy:
       matrix:

-        ubuntu: [20.04, 22.04]
-        ruby: [2.7, 3.0, 3.1]
+        ubuntu: [22.04, 24.04]
+        ruby: ['3.1', '3.2', '3.3']

     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@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/cache@v4

       with:
         path: node_modules
         key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }}
       with:
         path: node_modules
         key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }}


@@ -54,16 +55,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.4

       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 }}

+        format: lcov

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


@@ -71,7 +77,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.4

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