X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/19d62168607b8a355156b2c2e089b615ab4c9381..7d7126736e48363bb57a6bc78dd83d4913c890a9:/.github/workflows/tests.yml?ds=inline diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c1fa68072..bfe456076 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,29 +3,30 @@ 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: ['3.0', '3.1', '3.2'] 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 }} + rubygems: 3.4.10 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') }} @@ -40,8 +41,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,20 +49,23 @@ 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 bin/yarn install + - name: Compile assets + run: bundle exec rails assets:precompile - name: Run tests run: bundle exec rails test:all - name: Report completion to Coveralls - uses: coverallsapp/github-action@1.1.3 + uses: coverallsapp/github-action@v2.2.3 with: github-token: ${{ secrets.github_token }} flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }} + format: lcov parallel: true finish: name: Finalise @@ -71,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Report completion to Coveralls - uses: coverallsapp/github-action@1.1.3 + uses: coverallsapp/github-action@v2.2.3 with: github-token: ${{ secrets.github_token }} parallel-finished: true