From 266898937b538ee559981359956eb1ea786fe9f3 Mon Sep 17 00:00:00 2001 From: Mike Bender Date: Fri, 15 Mar 2024 13:37:53 -0400 Subject: [PATCH] build: Fix build script to commit all files post version bump - package.json files weren't being included in the commit, just commit everything - We can assume we're already at a clean slate in the post_package_bump --- cog.toml | 2 +- tools/update_version.sh | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/cog.toml b/cog.toml index 267ed42f3..09ddb6457 100644 --- a/cog.toml +++ b/cog.toml @@ -29,7 +29,7 @@ post_package_bump_hooks = [ "../../tools/extract_changelog.sh CHANGELOG.md > ../../releases/GITHUB_CHANGELOG-{{package}}.md", # update the version number to have a `dev0` suffix "../../tools/update_version.sh {{package}} {{version}} --dev", - "git commit -m 'chore(version): update {{package}} version to {{version}}'", + "git commit --all --message 'chore(version): update {{package}} version to {{version}}'", # push the tag and the commits to main "git push origin {{package}}-v{{version}}", "git push origin main", diff --git a/tools/update_version.sh b/tools/update_version.sh index d8bbd62ef..c737569dd 100755 --- a/tools/update_version.sh +++ b/tools/update_version.sh @@ -107,19 +107,12 @@ function update_file() { else sed -e "s/${prefix}.*/${expected}/g" -i "$ROOT_DIR/plugins/$file" fi - git add "$ROOT_DIR/plugins/$file" fi } extra= [ "$dev" = true ] && extra=".dev0" case "$package" in - auth-keycloak) - update_file auth-keycloak/src/js/package.json '"version": "' '",' - ;; - dashboard-object-viewer) - update_file dashboard-object-viewer/src/js/package.json '"version": "' '",' - ;; json) update_file json/src/deephaven/plugin/json/__init__.py '__version__ = "' '"' "$extra" ;; @@ -132,9 +125,6 @@ case "$package" in plotly-express) update_file plotly-express/setup.cfg 'version = ' '' "$extra" ;; - table-example) - update_file table-example/src/js/package.json '"version": "' '",' - ;; ui) update_file ui/setup.cfg 'version = ' '' "$extra" ;; @@ -155,7 +145,7 @@ esac npm_version="${version}" [ "$dev" = true ] && npm_version="${version}-dev0" case "$package" in - matplotlib | plotly | plotly-express | ui) + auth-keycloak | dashboard-object-viewer | matplotlib | plotly | plotly-express | table-example | ui) # The working directory is already `plugins/`, so we just specify workspace as `src/js` and it does the right thing npm version "$npm_version" --workspace=src/js ;;