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

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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ff1c365b30458d66856db97f10d995d930e49f26..16f5fe285192226b2084cba8a1a75948180e147c 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,14 +11,14 @@ jobs:
     strategy:
       matrix:
         ubuntu: [20.04, 22.04]
     strategy:
       matrix:
         ubuntu: [20.04, 22.04]

-        ruby: ['2.7', '3.0', '3.1']
+        ruby: ['3.0', '3.1']

     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:
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:


@@ -60,10 +60,11 @@ 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.2.2
+      uses: coverallsapp/github-action@v2.2.1

       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 +72,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.2.2
+      uses: coverallsapp/github-action@v2.2.1

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