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

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

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5f0f0f0786138ac2ae169affd5f31288129f3469..df617d4fbf2cd992db2842f9b7118b8a25df0714 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,10 +8,10 @@ concurrency:
 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@v3
+      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


@@ -28,6 +28,7 @@ jobs:
       run: |
         docker-compose run --rm web bundle exec rails db:migrate
         docker-compose run --rm web bundle exec rails i18n:js:export
       run: |
         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: |