X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8d76be71bbb8a799cbf0627dee170f26ade5a11f..c21c6f840227dd0de2931c7a00748aa9ea7b4dd7:/.github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d718dcfa7..74d03b31c 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
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout source
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v3
     - name: Poke config
       run: |
         cp config/example.storage.yml config/storage.yml
@@ -23,8 +26,9 @@ 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 web bundle exec rake i18n:js:export
+        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 bundle exec rails assets:precompile
         docker-compose run --rm web osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no
     - name: Test Basic Website
       run: |