X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c7e9ea3e8d4267f61a982464f575d495288d8b67..7d7126736e48363bb57a6bc78dd83d4913c890a9:/.github/workflows/tests.yml?ds=sidebyside diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a64598271..bfe456076 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,33 +2,31 @@ name: Tests on: - push - pull_request +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + cancel-in-progress: true jobs: test: name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }} strategy: matrix: - ubuntu: [18.04, 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@v2.3.5 + uses: actions/checkout@v4 - name: Setup ruby - uses: actions/setup-ruby@v1.1.3 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - - name: Cache gems - uses: actions/cache@v2.1.6 - with: - path: vendor/bundle - key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }} - restore-keys: | - bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}- + rubygems: 3.4.10 + bundler-cache: true - name: Cache node modules - uses: actions/cache@v2.1.6 + uses: actions/cache@v4 with: path: node_modules key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }} @@ -37,19 +35,12 @@ jobs: - name: Install packages run: | sudo apt-get -yqq update - sudo apt-get -yqq install memcached - - name: Install gems - run: | - gem install bundler - bundle config set deployment true - bundle install --jobs 4 --retry 3 + sudo apt-get -yqq install memcached libvips-dev - name: Create database run: | 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 @@ -58,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 @@ -79,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