added valhalla routing engine

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

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cc2420730faea28c41ed593ef5f71ea48b83e78a..5f0f0f0786138ac2ae169affd5f31288129f3469 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,7 +3,7 @@ on:
   - push
   - pull_request
 concurrency:
   - push
   - pull_request
 concurrency:

-  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

   cancel-in-progress: true
 jobs:
   test:
   cancel-in-progress: true
 jobs:
   test:


@@ -26,8 +26,8 @@ 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 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: |