From fdb330eb58d8fb8973c28d56e3d657e201208644 Mon Sep 17 00:00:00 2001
From: Ian Davis <jungziege@gmail.com>
Date: Fri, 20 Jan 2023 19:12:22 +0000
Subject: [PATCH] Properly balance <<?>> in circleci docker config

---
 .circleci/config.yml   | 6 +++---
 .circleci/template.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9315461f8..30a359fb3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -550,7 +550,7 @@ jobs:
             equal: [ mainnet, <<parameters.network>> ]
           steps:
             - when:
-                condition: <parameters.push>>
+                condition: <<parameters.push>>
                 steps:
                   - docker/build:
                       image: filecoin/<<parameters.image>>
@@ -561,7 +561,7 @@ jobs:
                       command: |
                         docker push filecoin/<<parameters.image>>:<<parameters.channel>>
                         if [[ ! -z $CIRCLE_SHA ]]; then
-                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>>> filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"
+                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>> filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"
                           docker push filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"
                         fi
                         if [[ ! -z $CIRCLE_TAG ]]; then
@@ -589,7 +589,7 @@ jobs:
                   - run:
                       name: Docker push
                       command: |
-                        docker push filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>>
+                        docker push filecoin/<<parameters.image>>:<<parameters.channel>>
                         if [[ ! -z $CIRCLE_SHA ]]; then
                           docker image tag filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>> filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"-<<parameters.network>>
                           docker push filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"-<<parameters.network>>
diff --git a/.circleci/template.yml b/.circleci/template.yml
index 6906f13f4..f6cc93c46 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -550,7 +550,7 @@ jobs:
             equal: [ mainnet, <<parameters.network>> ]
           steps:
             - when:
-                condition: <parameters.push>>
+                condition: <<parameters.push>>
                 steps:
                   - docker/build:
                       image: filecoin/<<parameters.image>>
@@ -561,7 +561,7 @@ jobs:
                       command: |
                         docker push filecoin/<<parameters.image>>:<<parameters.channel>>
                         if [["[[ ! -z $CIRCLE_SHA ]]"]]; then
-                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>>> filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"
+                          docker image tag filecoin/<<parameters.image>>:<<parameters.channel>> filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"
                           docker push filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"
                         fi
                         if [["[[ ! -z $CIRCLE_TAG ]]"]]; then
@@ -589,7 +589,7 @@ jobs:
                   - run:
                       name: Docker push
                       command: |
-                        docker push filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>>
+                        docker push filecoin/<<parameters.image>>:<<parameters.channel>>
                         if [["[[ ! -z $CIRCLE_SHA ]]"]]; then
                           docker image tag filecoin/<<parameters.image>>:<<parameters.channel>>-<<parameters.network>> filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"-<<parameters.network>>
                           docker push filecoin/<<parameters.image>>:"${CIRCLE_SHA:0:7}"-<<parameters.network>>