From a989ea718341075f841752d8cd65c0f0eabd9c6a Mon Sep 17 00:00:00 2001
From: Matt Strapp <matt@mattstrapp.net>
Date: Tue, 29 Oct 2024 16:49:41 -0500
Subject: Update changesets.yml and version-bump script

- Update changesets.yml to install additional software packages
- Modify version-bump script to pull the GIT_TAG from changeset if not set
- Bump version in multiple files and remove snapshot from gradle.properties

Signed-off-by: Matt Strapp <matt@mattstrapp.net>
---
 .github/workflows/changesets.yml |  4 ++--
 contrib/version-bump             | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/changesets.yml b/.github/workflows/changesets.yml
index f39d7f0..643c5aa 100644
--- a/.github/workflows/changesets.yml
+++ b/.github/workflows/changesets.yml
@@ -19,8 +19,8 @@ jobs:
           key: ${{ runner.os }}-turbo-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-turbo-
-      - name: Install ripgrep
-        run: sudo apt-get -y install ripgrep
+      - name: Install needed softwares
+        run: sudo apt-get -y install ripgrep moreutils
       - name: Install pnpm and dependencies
         uses: pnpm/action-setup@v4
         with:
diff --git a/contrib/version-bump b/contrib/version-bump
index fff89c2..09ca6a9 100644
--- a/contrib/version-bump
+++ b/contrib/version-bump
@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 
 if [ -z "$GIT_TAG" ]; then
-  echo "GIT_TAG is not set, guessing from changeset"
+  echo "GIT_TAG is not set, pulling from changeset"
   GIT_TAG=$(jq -r '.version' src/packages/locusts/package.json)
 fi
 
 OLD_TAG=$(jq -r '.version' package.json)
-
 echo "Bumping version from $OLD_TAG to $GIT_TAG"
 
 rg "$OLD_TAG" --files-with-matches --iglob \!\*lock\* --iglob \!go.mod --iglob \!deno.json --iglob \!package.json --iglob \!\*.md "$(pwd)" | xargs sed -i "s/$OLD_TAG/$GIT_TAG/g"
@@ -15,4 +14,10 @@ rg "$OLD_TAG" --files-with-matches --iglob \!\*lock\* --iglob \!go.mod --iglob \
 AUTOTOOLS_TAG=${GIT_TAG//\./:}
 OLD_TAG=${OLD_TAG//\./:}
 
-sed -i "s/$GIT_TAG/$AUTOTOOLS_TAG/g" GNUmakefile.am
\ No newline at end of file
+sed -i "s/$GIT_TAG/$AUTOTOOLS_TAG/g" GNUmakefile.am
+
+# remove the snapshot from gradle
+sed -i "s/-SNAPSHOT//g" gradle.properties
+
+# bump the main package.json too
+jq ".version = \"$GIT_TAG\"" package.json | sponge package.json
\ No newline at end of file
-- 
cgit v1.2.3