Skip to content

Commit

Permalink
fix: release-it does not properly set version on cask or docker
Browse files Browse the repository at this point in the history
  • Loading branch information
starpit committed Aug 26, 2022
1 parent ed0ee57 commit 37fde44
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion Casks/bump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down

0 comments on commit 37fde44

Please sign in to comment.