From e47cbef96a14f73bd904ebf5e281d75be12672f6 Mon Sep 17 00:00:00 2001
From: molinamelendezj <molinamelendezj@gmail.com>
Date: Wed, 21 Feb 2024 16:25:25 -0500
Subject: [PATCH 1/2] fix unknown flag error in release workflow

---
 .circleci/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/main.yml b/.circleci/main.yml
index 1e4f04383a0..c87a305296b 100644
--- a/.circleci/main.yml
+++ b/.circleci/main.yml
@@ -1267,14 +1267,14 @@ jobs:
             if [[ $CIRCLE_TAG == *"-"* ]];
               then
                   echo "git tag has - assuming prerelease."
-                  gh release create --draft ${CIRCLE_TAG:1}-1 --tittle ${CIRCLE_TAG:1}-1 --target $parentBranch --generate-notes --prerelease --repo pachyderm/haberdashery
+                  gh release create --draft ${CIRCLE_TAG:1} --title ${CIRCLE_TAG:1} --target $parentBranch --generate-notes --prerelease --repo pachyderm/haberdashery
               else
                   echo "regular release."
-                  gh release create --draft ${CIRCLE_TAG:1}-1 --tittle ${CIRCLE_TAG:1}-1 --target $parentBranch --generate-notes --repo pachyderm/haberdashery
+                  gh release create --draft ${CIRCLE_TAG:1} --title ${CIRCLE_TAG:1} --target $parentBranch --generate-notes --repo pachyderm/haberdashery
               fi
             SECONDS=0
             while :; do
-                docker pull pachyderm/haberdashery:${CIRCLE_TAG:1}-1 2>/dev/null && break
+                docker pull pachyderm/haberdashery:${CIRCLE_TAG:1} 2>/dev/null && break
                 if (( $SECONDS > 1 )); then
                     printf 'Waited 10 minutes for console docker image, inspect console relase at https://app.circleci.com/pipelines/gh/pachyderm/haberdashery for failures\n' >&2
                     exit 1
@@ -2023,7 +2023,7 @@ workflows:
       - release-github:
           name: github-release-console
           repo: pachyderm/haberdashery
-          tag: ${CIRCLE_TAG:1}-1
+          tag: ${CIRCLE_TAG:1}
           filters: *only-release-tags
           requires:
             - sign-off

From 72922afd484fc18d8358ba7d600b87ac0b87bad9 Mon Sep 17 00:00:00 2001
From: molinamelendezj <molinamelendezj@gmail.com>
Date: Wed, 21 Feb 2024 16:35:31 -0500
Subject: [PATCH 2/2] Update main.yml

---
 .circleci/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/main.yml b/.circleci/main.yml
index c87a305296b..1c898216b8a 100644
--- a/.circleci/main.yml
+++ b/.circleci/main.yml
@@ -1275,8 +1275,8 @@ jobs:
             SECONDS=0
             while :; do
                 docker pull pachyderm/haberdashery:${CIRCLE_TAG:1} 2>/dev/null && break
-                if (( $SECONDS > 1 )); then
-                    printf 'Waited 10 minutes for console docker image, inspect console relase at https://app.circleci.com/pipelines/gh/pachyderm/haberdashery for failures\n' >&2
+                if (( $SECONDS > 600 )); then
+                    printf 'Waited 10 minutes for console docker image to appear in the registry, inspect console relase at https://app.circleci.com/pipelines/gh/pachyderm/haberdashery for failures or delays\n' >&2
                     exit 1
                 fi
                 sleep 1