From 381be88a14f78241a915ae570fb04636f9c3deb8 Mon Sep 17 00:00:00 2001 From: Alvin Huang Date: Tue, 25 Jun 2019 16:46:17 -0400 Subject: [PATCH] remove skip-checks on git merge (#6017) * remove skip-checks on git merge * remove comments for skip-checks --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9d9cfa6062..dc7ec95385 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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