Merge branch 'next-minor' into develop

This commit is contained in:
Jonne Haß 2020-11-04 18:09:41 +01:00
commit e167584f7f
2 changed files with 5 additions and 1 deletions

View file

@ -58,3 +58,7 @@ jobs:
run: bundle
- name: Run tests
run: bin/rake --trace ci:${{ matrix.kind }}
- name: Run Jasmine
run: bin/rake jasmine:ci
timeout-minutes: 2
if: matrix.kind == 'other'

View file

@ -5,7 +5,7 @@ namespace :ci do
task prepare: %w[prepare_db assets:generate_error_pages]
desc "Run everyhting except cucumber"
task other: %w[prepare tests:generate_fixtures spec jasmine:ci]
task other: %w[prepare tests:generate_fixtures spec]
desc "Run cucumber"
task cucumber: %w[prepare rake:cucumber]