Skip to content

Commit 37fde44

Browse files
committed
fix: release-it does not properly set version on cask or docker
1 parent ed0ee57 commit 37fde44

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Diff for: Casks/bump.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
# electron builds. This assumes that those builds have already been
66
# performed, and will fail otherwise.
77
#
8+
# VERSION env var must be set to the desired version.
9+
#
810

911
set -e
1012
set -o pipefail
@@ -17,7 +19,7 @@ arm64=$(sha256sum "$SCRIPTDIR"/../dist/electron/CodeFlare-darwin-arm64.tar.bz2 |
1719
cp "$SCRIPTDIR"/codeflare.rb "$SCRIPTDIR"/codeflare.rb.bak
1820

1921
cat "$SCRIPTDIR"/codeflare.tpl \
20-
| sed -r "s/{{ version }}/$version/g" \
22+
| sed -r "s/{{ version }}/$VERSION/g" \
2123
| sed -r "s/{{ x64 }}/$x64/g" \
2224
| sed -r "s/{{ arm64 }}/$arm64/g" \
2325
> "$SCRIPTDIR"/codeflare.rb

Diff for: package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"pty:nodejs": "npm run pty:rebuild node",
2222
"prepare": "cross-env husky install",
2323
"build:docker:cli": "npm run build:headless-maybe && docker build -f deploy/cli/Dockerfile -t ghcr.io/project-codeflare/codeflare-cli .",
24-
"publish:docker:log-aggregator": "docker push ghcr.io/project-codeflare/codeflare-log-aggregator:${version-latest}",
24+
"publish:docker:log-aggregator": "docker push ghcr.io/project-codeflare/codeflare-log-aggregator:${VERSION-latest}",
2525
"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}} .",
2626
"build:docker:self-test": "cd deploy/self-test && docker build -t ghcr.io/project-codeflare/codeflare-self-test .",
2727
"build:headless-maybe": "if [ ! -n \"$FAST\" ]; then npm run build:headless; fi",
@@ -96,11 +96,11 @@
9696
"rm -rf ./dist/electron",
9797
"rm -rf ./dist/headless",
9898
"npm run build:electron:all",
99-
"npm run release:cask",
100-
"npm run build:docker:log-aggregator"
99+
"VERSION=$version npm run release:cask",
100+
"VERSION=$version npm run build:docker:log-aggregator"
101101
],
102102
"after:release": [
103-
"npm run publish:docker:log-aggregator"
103+
"VERSION=$version npm run publish:docker:log-aggregator"
104104
]
105105
},
106106
"npm": {

0 commit comments

Comments
 (0)