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

skip checks on merge commit (#6000)

This commit is contained in:
Alvin Huang 2019-06-20 16:27:45 -04:00 committed by GitHub
parent f1a6919b2f
commit 29c1e4fcc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -455,7 +455,9 @@ jobs:
git_merge_branch="ci/master-merge-$(date +%Y%m%d%H%M%S)" git_merge_branch="ci/master-merge-$(date +%Y%m%d%H%M%S)"
git checkout -b "${git_merge_branch}" git checkout -b "${git_merge_branch}"
latest_oss_commit="$(git rev-parse origin/master)" latest_oss_commit="$(git rev-parse origin/master)"
git merge -m "Merge Consul OSS branch 'master' at commit ${latest_oss_commit}" "${latest_oss_commit}" # 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 push origin "${git_merge_branch}" git push origin "${git_merge_branch}"
sleep 15 # Wait for merge branch to start CircleCI pipeline sleep 15 # Wait for merge branch to start CircleCI pipeline