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

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

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a24c745f248d75b4dbb9a55f22d08321bb770ed7..771d307cfe8d412631548f0ebec2a629fe46b897 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


@@ -16,16 +19,17 @@ jobs:
         touch config/settings.local.yml
     - name: Build Docker Image
       run: |
         touch config/settings.local.yml
     - name: Build Docker Image
       run: |

-        docker-compose build
-    - name: Start Docker-Compose
+        docker compose build
+    - name: Start Docker Compose

       run: |
       run: |

-        docker-compose up -d
+        docker compose up -d

         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 osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no
+        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: |
         curl -siL http://127.0.0.1:3000 | egrep '^HTTP/1.1 200 OK'
     - name: Test Basic Website
       run: |
         curl -siL http://127.0.0.1:3000 | egrep '^HTTP/1.1 200 OK'


@@ -33,5 +37,5 @@ jobs:
         curl -siL http://127.0.0.1:3000/api/0.6/node/1 | grep 'Null Island'
     - name: Test Complete Suite
       run: |
         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
+        docker compose run --rm web bundle exec rails db:test:prepare
+        docker compose run --rm web bundle exec rails test:all