X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/309bdd1e3182c2926576b5005ecaf3daa91cedf2..1d5ba57c4943c804486ab2891ae5e73a6c798a4d:/.github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 29ef1e8b8..acc19b8c0 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,6 +2,9 @@ name: Docker on: - push - pull_request +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + cancel-in-progress: true jobs: test: name: Docker @@ -23,8 +26,9 @@ 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 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: |