remove ci merge branches if nightly merge fails (#6369)

.circleci/config.yml

@@ -20,7 +20,7 @@ references:
     EMAIL: noreply@hashicorp.com
     GIT_AUTHOR_NAME: circleci-consul
     GIT_COMMITTER_NAME: circleci-consul
-    S3_ARTIFACT_BUCKET:  consul-dev-artifacts
+    S3_ARTIFACT_BUCKET: consul-dev-artifacts
     BASH_ENV: .circleci/bash_env.sh
 
 jobs:
@@ -40,13 +40,13 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - consul-modcache-v1-{{ checksum "go.mod" }}
+            - consul-modcache-v1-{{ checksum "go.mod" }}
       - run:
           command: go mod download
       - save_cache:
           key: consul-modcache-v1-{{ checksum "go.mod" }}
           paths:
-          - /go/pkg/mod
+            - /go/pkg/mod
       - run:
           name: check go fmt
           command: |
@@ -71,13 +71,13 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - consul-modcache-v1-{{ checksum "go.mod" }}
+            - consul-modcache-v1-{{ checksum "go.mod" }}
       - run:
           command: make update-vendor
       - save_cache:
           key: consul-modcache-v1-{{ checksum "go.mod" }}
           paths:
-          - /go/pkg/mod
+            - /go/pkg/mod
       - run: |
           if ! git diff --exit-code; then
             echo "Git directory has vendor changes"
@@ -90,12 +90,12 @@ jobs:
     parallelism: 4
     environment:
       <<: *ENVIRONMENT
-      GOTAGS: '' # No tags for OSS but there are for enterprise
+      GOTAGS: "" # No tags for OSS but there are for enterprise
     steps:
       - checkout
       - restore_cache: # restore cache from dev-build job
           keys:
-          - consul-modcache-v1-{{ checksum "go.mod" }}
+            - consul-modcache-v1-{{ checksum "go.mod" }}
       - attach_workspace:
           at: /go/bin
       - run: mkdir -p $TEST_RESULTS_DIR
@@ -116,12 +116,12 @@ jobs:
       - image: *GOLANG_IMAGE
     environment:
       <<: *ENVIRONMENT
-      GOTAGS: '' # No tags for OSS but there are for enterprise
+      GOTAGS: "" # No tags for OSS but there are for enterprise
     steps:
       - checkout
       - restore_cache: # restore cache from dev-build job
           keys:
-          - consul-modcache-v1-{{ checksum "go.mod" }}
+            - consul-modcache-v1-{{ checksum "go.mod" }}
       - attach_workspace:
           at: /go/bin
       - run: mkdir -p $TEST_RESULTS_DIR
@@ -209,13 +209,13 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - consul-modcache-v1-{{ checksum "go.mod" }}
+            - consul-modcache-v1-{{ checksum "go.mod" }}
       - run:
           command: make dev
       - save_cache:
           key: consul-modcache-v1-{{ checksum "go.mod" }}
           paths:
-          - /go/pkg/mod
+            - /go/pkg/mod
 
       # save dev build to pass to downstream jobs
       - persist_to_workspace:
@@ -466,8 +466,7 @@ jobs:
       - image: *GOLANG_IMAGE
     environment:
       ENVOY_VERSIONS: "1.8.0"
-    steps:
-      &ENVOY_INTEGRATION_TEST_STEPS
+    steps: &ENVOY_INTEGRATION_TEST_STEPS
       - checkout
       # Get go binary from workspace
       - attach_workspace:
@@ -508,7 +507,7 @@ jobs:
     steps:
       - add_ssh_keys:
           fingerprints:
-          - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
       - checkout
       - run:
           name: Merge Consul OSS master branch into current branch
@@ -587,6 +586,7 @@ jobs:
                   } \
                 ] \
               }" ${CONSUL_SLACK_WEBHOOK_URL}
+              git push --delete origin "${git_merge_branch}"
               exit 1
             fi