Skip to content

G
gitlab-ce
Commit 5b381ff7 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in '.gitlab-ci.yml' 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 0e5ff317
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
.gitlab-ci.yml
View file @ 5b381ff7
...@@ -458,7 +458,6 @@ retrieve-tests-metadata: ...@@ -458,7 +458,6 @@ retrieve-tests-metadata:
- wget -O $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH || rm $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH - wget -O $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH || rm $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH
- '[[ -f $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH}' - '[[ -f $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH}'
<<<<<<< HEAD
.ee-specific-check: &ee-specific-check .ee-specific-check: &ee-specific-check
<<: *dedicated-runner <<: *dedicated-runner
stage: test stage: test
...@@ -484,8 +483,6 @@ ee-specific-lines-check: ...@@ -484,8 +483,6 @@ ee-specific-lines-check:
script: script:
- scripts/ee-specific-lines-check - scripts/ee-specific-lines-check
=======
>>>>>>> upstream/master
update-tests-metadata: update-tests-metadata:
<<: *tests-metadata-state <<: *tests-metadata-state
<<: *only-canonical-masters <<: *only-canonical-masters
......
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