X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1e5cc598bbf4199bcb3b4f1f1597efb73d5c7108..2c497aee7a45c31ae6d1a448c35ce1b3f0ebb608:/.github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c7874db39..5f0f0f078 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,13 +2,16 @@ name: Docker
 on:
   - push
   - pull_request
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 jobs:
   test:
     name: Docker
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout source
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
     - name: Poke config
       run: |
         cp config/example.storage.yml config/storage.yml
@@ -23,11 +26,15 @@ jobs:
         sleep 15 # let the DB warm up a little
     - name: Prepare Database
       run: |
-        docker-compose run --rm web rake db:migrate
+        docker-compose run --rm web bundle exec rails db:migrate
+        docker-compose run --rm web bundle exec rails i18n:js:export
         docker-compose run --rm web osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no
-        docker-compose run web bundle exec rake yarn:install
     - name: Test Basic Website
       run: |
         curl -siL http://127.0.0.1:3000 | egrep '^HTTP/1.1 200 OK'
         curl -siL http://127.0.0.1:3000 | grep 'OpenStreetMap is the free wiki world map'
         curl -siL http://127.0.0.1:3000/api/0.6/node/1 | grep 'Null Island'
+    - name: Test Complete Suite
+      run: |
+        docker-compose run --rm web bundle exec rails db:test:prepare
+        docker-compose run --rm web bundle exec rails test:all