From 52af58c93f1671e07d9fa19d621a4e6b25fff48b Mon Sep 17 00:00:00 2001 From: Alvin Huang Date: Thu, 20 Jun 2019 16:27:45 -0400 Subject: [PATCH] skip checks on merge commit (#6000) --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 18a1d1d699..8248157b4d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -455,7 +455,9 @@ 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)" - 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}" sleep 15 # Wait for merge branch to start CircleCI pipeline