From 97eca7ac9868956a8cd17a7a85cbd2c50ac3c4c3 Mon Sep 17 00:00:00 2001 From: anthony sottile <103459774+asottile-sentry@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:37:23 -0400 Subject: [PATCH 1/3] + versions don't work sadface --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4bf75bbd2..fddbe69d6 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ git checkout 1.2.3 -b sentry-1.2.3 - cherry-pick relevant commit(s) from previous releases releases are done through craft in the release.yml workflow -- make sure to -target your particular branch with a `+sentry#` release postfix +target your particular branch with a `.#` release postfix (like `1.2.3.0`) ___ From efb85b81a0694e70bf591d6dfad3caa35df0afe1 Mon Sep 17 00:00:00 2001 From: anthony sottile <103459774+asottile-sentry@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:44:47 -0400 Subject: [PATCH 2/3] Update bump-version.sh --- scripts/bump-version.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index d7c26edc2..362a6f94d 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -1,8 +1,4 @@ #!/usr/bin/env bash set -euxo pipefail -if ! grep -E '^.*\+sentry[0-9]+' <<< "$2"; then - : "version must be D.D.D+sentryD got: $2" - exit 1 -fi sed -i "s/^ version="'"'".*"'"'",$/ version="'"'"$2"'"'",/" setup.py From 7b4c852896e184f2b183917afd51c46e8bac9fca Mon Sep 17 00:00:00 2001 From: anthony sottile Date: Tue, 31 Oct 2023 17:07:43 -0400 Subject: [PATCH 3/3] use post versions --- README.md | 2 +- scripts/bump-version.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fddbe69d6..e94320522 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ git checkout 1.2.3 -b sentry-1.2.3 - cherry-pick relevant commit(s) from previous releases releases are done through craft in the release.yml workflow -- make sure to -target your particular branch with a `.#` release postfix (like `1.2.3.0`) +target your particular branch with a `-#` release postfix (like `1.2.3-1`) ___ diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 362a6f94d..b00c67979 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash set -euxo pipefail +if ! grep -E '^[0-9]+\.[0-9]+\.[0-9]+-[0-9]+$' <<< "$2"; then + : "expected #.#.#-# got $2" + exit 1 +fi + sed -i "s/^ version="'"'".*"'"'",$/ version="'"'"$2"'"'",/" setup.py