Skip to content

F
Front-End
Unverified Commit 456fe1ab authored by Ian Hickson's avatar Ian Hickson Committed by GitHub
Browse files
Options

Prevent merge conflicts when running customer tests. (#86063)

parent 711f9b7c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
.cirrus.yml
View file @ 456fe1ab
...@@ -154,7 +154,6 @@ task: ...@@ -154,7 +154,6 @@ task:
# otherwise we won't be able to figure out how old or new our current branch is. # otherwise we won't be able to figure out how old or new our current branch is.
- git config user.email "cirrus-bot@invalid" - git config user.email "cirrus-bot@invalid"
- git fetch origin master:master - git fetch origin master:master
- git rebase master
# The actual logic is in a shell script so that it can be shared between CIs. # The actual logic is in a shell script so that it can be shared between CIs.
- (cd dev/customer_testing/; ./ci.sh) - (cd dev/customer_testing/; ./ci.sh)
......
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

HIAST - GitLab