Commit 9b76bb30 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fix .gitlab-ci.yml

parent 03a7569e
...@@ -34,7 +34,7 @@ stages: ...@@ -34,7 +34,7 @@ stages:
# Prepare and merge knapsack tests # Prepare and merge knapsack tests
.knapsack_state: &knapsack_state .knapsack-state: &knapsack-state
services: [] services: []
variables: variables:
USE_DB: "false" USE_DB: "false"
...@@ -48,7 +48,7 @@ stages: ...@@ -48,7 +48,7 @@ stages:
- knapsack/ - knapsack/
knapsack: knapsack:
<<: *rspec-knapsack_state <<: *knapsack-state
stage: prepare stage: prepare
script: script:
- mkdir -p knapsack/ - mkdir -p knapsack/
...@@ -56,7 +56,7 @@ knapsack: ...@@ -56,7 +56,7 @@ knapsack:
- '[[ -f knapsack/spinach_report.json ]] || echo "{}" > knapsack/spinach_report.json' - '[[ -f knapsack/spinach_report.json ]] || echo "{}" > knapsack/spinach_report.json'
update-knapsack: update-knapsack:
<<: *rspec-knapsack_state <<: *knapsack-state
stage: post-test stage: post-test
script: script:
- scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json - scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json
...@@ -65,7 +65,7 @@ update-knapsack: ...@@ -65,7 +65,7 @@ update-knapsack:
# Execute all testing suites # Execute all testing suites
.rspec-knapsack: &knapsack .rspec-knapsack: &rspec-knapsack
stage: test stage: test
script: script:
- bundle exec rake assets:precompile 2>/dev/null - bundle exec rake assets:precompile 2>/dev/null
...@@ -80,7 +80,7 @@ update-knapsack: ...@@ -80,7 +80,7 @@ update-knapsack:
paths: paths:
- knapsack/ - knapsack/
.spinach-knapsack: &knapsack .spinach-knapsack: &spinach-knapsack
stage: test stage: test
script: script:
- bundle exec rake assets:precompile 2>/dev/null - bundle exec rake assets:precompile 2>/dev/null
...@@ -131,7 +131,7 @@ spinach 9 10: *spinach-knapsack ...@@ -131,7 +131,7 @@ spinach 9 10: *spinach-knapsack
# Execute all testing suites against Ruby 2.2 # Execute all testing suites against Ruby 2.2
.ruby-22: &ruby22 .ruby-22: &ruby-22
image: "ruby:2.2" image: "ruby:2.2"
only: only:
- master - master
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment