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

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

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a24c745f248d75b4dbb9a55f22d08321bb770ed7..df617d4fbf2cd992db2842f9b7118b8a25df0714 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,13 +2,16 @@ name: Docker
 on:
   - push
   - pull_request
 on:
   - push
   - pull_request

+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true

 jobs:
   test:
     name: Docker
 jobs:
   test:
     name: Docker

-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04

     steps:
     - name: Checkout source
     steps:
     - name: Checkout source

-      uses: actions/checkout@v2.4.0
+      uses: actions/checkout@v4

     - name: Poke config
       run: |
         cp config/example.storage.yml config/storage.yml
     - 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: |
         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: |
         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: |