Skip to content

G
gitlab-ce
Commit 2bb1d07b authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in .gitlab-ci.yml

parent c79d06ce
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
.gitlab-ci.yml
View file @ 2bb1d07b
...@@ -201,11 +201,7 @@ stages: ...@@ -201,11 +201,7 @@ stages:
- '[[ -f $FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_REPORT_PATH}' - '[[ -f $FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_REPORT_PATH}'
- '[[ -f $NEW_FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${NEW_FLAKY_RSPEC_REPORT_PATH}' - '[[ -f $NEW_FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${NEW_FLAKY_RSPEC_REPORT_PATH}'
- scripts/gitaly-test-spawn - scripts/gitaly-test-spawn
<<<<<<< HEAD
- knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag ~geo" - knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag ~geo"
=======
- knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml"
>>>>>>> upstream/master
artifacts: artifacts:
expire_in: 31d expire_in: 31d
when: always when: always
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7