From 37fde444cd15e2135552f6b39c07f65879b886e4 Mon Sep 17 00:00:00 2001
From: Nick Mitchell <nickm@us.ibm.com>
Date: Thu, 25 Aug 2022 09:49:27 -0400
Subject: [PATCH] fix: release-it does not properly set version on cask or
 docker

---
 Casks/bump.sh | 4 +++-
 package.json  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Casks/bump.sh b/Casks/bump.sh
index f021f592..40fe4019 100755
--- a/Casks/bump.sh
+++ b/Casks/bump.sh
@@ -5,6 +5,8 @@
 # electron builds. This assumes that those builds have already been
 # performed, and will fail otherwise.
 #
+# VERSION env var must be set to the desired version.
+#
 
 set -e
 set -o pipefail
@@ -17,7 +19,7 @@ arm64=$(sha256sum "$SCRIPTDIR"/../dist/electron/CodeFlare-darwin-arm64.tar.bz2 |
 cp "$SCRIPTDIR"/codeflare.rb "$SCRIPTDIR"/codeflare.rb.bak
 
 cat "$SCRIPTDIR"/codeflare.tpl \
-    | sed -r "s/{{ version }}/$version/g" \
+    | sed -r "s/{{ version }}/$VERSION/g" \
     | sed -r "s/{{ x64 }}/$x64/g" \
     | sed -r "s/{{ arm64 }}/$arm64/g" \
           > "$SCRIPTDIR"/codeflare.rb
diff --git a/package.json b/package.json
index 3e7488ff..d3bb1877 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "pty:nodejs": "npm run pty:rebuild node",
     "prepare": "cross-env husky install",
     "build:docker:cli": "npm run build:headless-maybe && docker build -f deploy/cli/Dockerfile -t ghcr.io/project-codeflare/codeflare-cli .",
-    "publish:docker:log-aggregator": "docker push ghcr.io/project-codeflare/codeflare-log-aggregator:${version-latest}",
+    "publish:docker:log-aggregator": "docker push ghcr.io/project-codeflare/codeflare-log-aggregator:${VERSION-latest}",
     "build:docker:log-aggregator": "npm run build:headless-maybe && docker build -f deploy/log-aggregator/Dockerfile -t ${LOG_AGGREGATOR_IMAGE-ghcr.io/project-codeflare/codeflare-log-aggregator:${version-latest}} .",
     "build:docker:self-test": "cd deploy/self-test && docker build -t ghcr.io/project-codeflare/codeflare-self-test .",
     "build:headless-maybe": "if [ ! -n \"$FAST\" ]; then npm run build:headless; fi",
@@ -96,11 +96,11 @@
         "rm -rf ./dist/electron",
         "rm -rf ./dist/headless",
         "npm run build:electron:all",
-        "npm run release:cask",
-        "npm run build:docker:log-aggregator"
+        "VERSION=$version npm run release:cask",
+        "VERSION=$version npm run build:docker:log-aggregator"
       ],
       "after:release": [
-        "npm run publish:docker:log-aggregator"
+        "VERSION=$version npm run publish:docker:log-aggregator"
       ]
     },
     "npm": {