X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..d90bbff3464e46b4094aa702a86eb054057234bd:/.github/workflows/docker.yml?ds=sidebyside diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cc2420730..5f0f0f078 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,7 +3,7 @@ on: - 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: @@ -26,8 +26,8 @@ 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 osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no - name: Test Basic Website run: |