From 9c64d297b34161c58018a1557a5d4b2ed7adbc46 Mon Sep 17 00:00:00 2001 From: Matt Strapp Date: Wed, 30 Oct 2024 10:35:18 -0500 Subject: Oops Signed-off-by: Matt Strapp --- contrib/tag-repo | 17 +---------------- contrib/version-bump | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/contrib/tag-repo b/contrib/tag-repo index 09ca6a9..fb0b930 100755 --- a/contrib/tag-repo +++ b/contrib/tag-repo @@ -5,19 +5,4 @@ if [ -z "$GIT_TAG" ]; then 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" - -# fiddle with autotools -AUTOTOOLS_TAG=${GIT_TAG//\./:} -OLD_TAG=${OLD_TAG//\./:} - -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 +git tag v"$GIT_TAG" diff --git a/contrib/version-bump b/contrib/version-bump index fb0b930..09ca6a9 100755 --- a/contrib/version-bump +++ b/contrib/version-bump @@ -5,4 +5,19 @@ if [ -z "$GIT_TAG" ]; then GIT_TAG=$(jq -r '.version' src/packages/locusts/package.json) fi -git tag v"$GIT_TAG" +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" + +# fiddle with autotools +AUTOTOOLS_TAG=${GIT_TAG//\./:} +OLD_TAG=${OLD_TAG//\./:} + +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