luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

remove skip-checks on git merge (#6017) 

* remove skip-checks on git merge

* remove comments for skip-checks
This commit is contained in:
Alvin Huang 2019-06-25 16:46:17 -04:00 committed by GitHub
parent d237e86d83
commit 869e07573c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -467,9 +467,7 @@ jobs:
git_merge_branch="ci/master-merge-$(date +%Y%m%d%H%M%S)"
git checkout -b "${git_merge_branch}"
latest_oss_commit="$(git rev-parse origin/master)"
# adding two merge messages will add them into different paragraphs which will achieve what is in
# https://help.github.com/en/articles/about-status-checks#skipping-and-requesting-checks-for-individual-commits
git merge -m "Merge Consul OSS branch 'master' at commit ${latest_oss_commit}" -m "skip-checks: true" "${latest_oss_commit}"
git merge -m "Merge Consul OSS branch 'master' at commit ${latest_oss_commit}" "${latest_oss_commit}"
git push origin "${git_merge_branch}"
sleep 15 # Wait for merge branch to start CircleCI pipeline