From b52f880f775daa48de3df66bcd7f02135ebe67a8 Mon Sep 17 00:00:00 2001 From: Anika Maskara Date: Tue, 17 Dec 2024 16:47:08 -0500 Subject: [PATCH 1/3] fix version number calculation --- .github/workflows/prepare_release.yml | 2 +- RELEASING.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml index 348b02c50cfe..5f50e40c17dd 100644 --- a/.github/workflows/prepare_release.yml +++ b/.github/workflows/prepare_release.yml @@ -45,7 +45,7 @@ jobs: run: | if [ "${VERSION}" = "" ] ; then LATEST_TAG=$(git describe --tags --abbrev=0) - NEXT_TAG=$(echo ${LATEST_TAG#v} | awk '{split($0, a, "."); print a[1] "." a[2] + 1 "." a[3]}') + NEXT_TAG=$(echo ${LATEST_TAG} | awk '{split($0, a, "."); print a[1] "." a[2] + 1 ".0"}') echo "version=$NEXT_TAG" >> $GITHUB_OUTPUT else echo "version=$VERSION" >> $GITHUB_OUTPUT diff --git a/RELEASING.md b/RELEASING.md index cca1500472f5..09e76b324625 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -28,7 +28,7 @@ The release process is controlled and run by GitHub Actions. ### Update Changelog 1. Open [prepare release](https://github.com/DataDog/datadog-api-client-ruby/actions/workflows/prepare_release.yml) and click on `Run workflow` dropdown. -1. Enter new version identifier in the `New version number` input box (e.g. `1.8.0`). +1. If needed, enter new version identifier in the `New version number` input box (e.g. `1.10.0`). The default updates the previous minor. 1. Trigger the action by clicking on `Run workflow` button. ### Review From 01dabcb0bf9080354abc8099e10745b968e0afc4 Mon Sep 17 00:00:00 2001 From: Anika Maskara Date: Tue, 17 Dec 2024 16:48:49 -0500 Subject: [PATCH 2/3] fix version number calculation --- .github/workflows/prepare_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml index 5f50e40c17dd..4d962376abba 100644 --- a/.github/workflows/prepare_release.yml +++ b/.github/workflows/prepare_release.yml @@ -45,7 +45,7 @@ jobs: run: | if [ "${VERSION}" = "" ] ; then LATEST_TAG=$(git describe --tags --abbrev=0) - NEXT_TAG=$(echo ${LATEST_TAG} | awk '{split($0, a, "."); print a[1] "." a[2] + 1 ".0"}') + NEXT_TAG=$(echo ${LATEST_TAG#v} | awk '{split($0, a, "."); print a[1] "." a[2] + 1 ".0"}') echo "version=$NEXT_TAG" >> $GITHUB_OUTPUT else echo "version=$VERSION" >> $GITHUB_OUTPUT From deb64d7d5bde3e7bf39ba86239b1eda9f498dfa6 Mon Sep 17 00:00:00 2001 From: amaskara-dd <175134603+amaskara-dd@users.noreply.github.com> Date: Tue, 17 Dec 2024 16:52:00 -0500 Subject: [PATCH 3/3] Update RELEASING.md Co-authored-by: Jen Gilbert --- RELEASING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASING.md b/RELEASING.md index 09e76b324625..1b593ae4dcae 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -28,7 +28,7 @@ The release process is controlled and run by GitHub Actions. ### Update Changelog 1. Open [prepare release](https://github.com/DataDog/datadog-api-client-ruby/actions/workflows/prepare_release.yml) and click on `Run workflow` dropdown. -1. If needed, enter new version identifier in the `New version number` input box (e.g. `1.10.0`). The default updates the previous minor. +1. If needed, enter a new version identifier in the `New version number` input box (e.g. `1.10.0`). The default updates the previous minor. 1. Trigger the action by clicking on `Run workflow` button. ### Review