From 62374ce2d2d9670adeb578059d67c62fdc20463b Mon Sep 17 00:00:00 2001 From: Orkun Date: Tue, 6 May 2025 15:09:00 +0300 Subject: [PATCH 1/5] chore: fix generator script for dev versions --- scripts/generate.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/generate.sh b/scripts/generate.sh index 224c462f..80dae247 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -14,11 +14,19 @@ done # jar was downloaded from here https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.34/ -if [[ $VERSION == *"develop"* ]]; then - SANITIZED_VERSION=$(sed 's/-develop//g' <<< $VERSION) - SANITIZED_VERSION=$(sed 's/\.[0-9]*$//g' <<< $SANITIZED_VERSION) - BUILD_VERSION=$(grep -o '[0-9]*$' <<< $VERSION) - VERSION="dev-$SANITIZED_VERSION-$BUILD_VERSION" +VERSION=${VERSION//develop/dev} + +if [[ $VERSION =~ ^dev[.-]([0-9]+)[.-]([0-9]+)[.-]([0-9]+)[.-]([0-9]+)$ ]]; then + VERSION="dev-${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}.${BASH_REMATCH[4]}" +elif [[ $VERSION =~ ^([0-9]+)[.-]([0-9]+)[.-]([0-9]+)[.-]dev[.-]([0-9]+)$ ]]; then + VERSION="dev-${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}.${BASH_REMATCH[4]}" +elif [[ $VERSION == dev-* ]]; then + _temp_part=${VERSION#dev-} + VERSION="dev-${_temp_part//-/.}" +elif [[ $VERSION == *-dev* ]]; then + _temp_part=${VERSION#*-dev} + _temp_part=${_temp_part//-/.} + VERSION="${VERSION%%-dev*}-dev$_temp_part" fi echo "VERSION: $VERSION" From 6d86d1f484cdbbfd3e18b28418d23045aa205e6b Mon Sep 17 00:00:00 2001 From: Orkun Date: Tue, 6 May 2025 16:20:25 +0300 Subject: [PATCH 2/5] chore: use tag format instead of branch format --- scripts/generate.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/generate.sh b/scripts/generate.sh index 80dae247..4e50cc8a 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -17,12 +17,12 @@ done VERSION=${VERSION//develop/dev} if [[ $VERSION =~ ^dev[.-]([0-9]+)[.-]([0-9]+)[.-]([0-9]+)[.-]([0-9]+)$ ]]; then - VERSION="dev-${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}.${BASH_REMATCH[4]}" + VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}-dev.${BASH_REMATCH[4]}" elif [[ $VERSION =~ ^([0-9]+)[.-]([0-9]+)[.-]([0-9]+)[.-]dev[.-]([0-9]+)$ ]]; then - VERSION="dev-${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}.${BASH_REMATCH[4]}" + VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}-dev.${BASH_REMATCH[4]}" elif [[ $VERSION == dev-* ]]; then _temp_part=${VERSION#dev-} - VERSION="dev-${_temp_part//-/.}" + VERSION="${_temp_part//-/.}-dev" elif [[ $VERSION == *-dev* ]]; then _temp_part=${VERSION#*-dev} _temp_part=${_temp_part//-/.} From 217ee1450cccb6c142b623c852562f5e09e98562 Mon Sep 17 00:00:00 2001 From: Orkun Date: Tue, 13 May 2025 15:56:10 +0300 Subject: [PATCH 3/5] chore: change channel for prereleases --- scripts/generate.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/generate.sh b/scripts/generate.sh index 4e50cc8a..0ad82789 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -17,16 +17,16 @@ done VERSION=${VERSION//develop/dev} if [[ $VERSION =~ ^dev[.-]([0-9]+)[.-]([0-9]+)[.-]([0-9]+)[.-]([0-9]+)$ ]]; then - VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}-dev.${BASH_REMATCH[4]}" + VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}-beta.${BASH_REMATCH[4]}" elif [[ $VERSION =~ ^([0-9]+)[.-]([0-9]+)[.-]([0-9]+)[.-]dev[.-]([0-9]+)$ ]]; then - VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}-dev.${BASH_REMATCH[4]}" + VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}-beta.${BASH_REMATCH[4]}" elif [[ $VERSION == dev-* ]]; then _temp_part=${VERSION#dev-} - VERSION="${_temp_part//-/.}-dev" + VERSION="${_temp_part//-/.}-beta" elif [[ $VERSION == *-dev* ]]; then _temp_part=${VERSION#*-dev} _temp_part=${_temp_part//-/.} - VERSION="${VERSION%%-dev*}-dev$_temp_part" + VERSION="${VERSION%%-dev*}-beta$_temp_part" fi echo "VERSION: $VERSION" From ebfaa3d1aef88a4c12d6fb054ba397740e3c3596 Mon Sep 17 00:00:00 2001 From: Orkun Date: Tue, 13 May 2025 15:58:54 +0300 Subject: [PATCH 4/5] chore: add example values for regexp --- scripts/generate.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/generate.sh b/scripts/generate.sh index 0ad82789..0cc26513 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -16,6 +16,11 @@ done VERSION=${VERSION//develop/dev} +# Example for the regex below: +# dev.1.0.0.0 +# dev-1.0.0-0 +# dev.1.0.0-0 +# dev-1.0.0.0 if [[ $VERSION =~ ^dev[.-]([0-9]+)[.-]([0-9]+)[.-]([0-9]+)[.-]([0-9]+)$ ]]; then VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}-beta.${BASH_REMATCH[4]}" elif [[ $VERSION =~ ^([0-9]+)[.-]([0-9]+)[.-]([0-9]+)[.-]dev[.-]([0-9]+)$ ]]; then From a9f5de1df366399a0873a0a21c05c5f990224e3e Mon Sep 17 00:00:00 2001 From: Orkun Date: Tue, 13 May 2025 16:21:41 +0300 Subject: [PATCH 5/5] chore: update regexp examples --- scripts/generate.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/generate.sh b/scripts/generate.sh index 0cc26513..4fefe885 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -16,14 +16,19 @@ done VERSION=${VERSION//develop/dev} -# Example for the regex below: -# dev.1.0.0.0 -# dev-1.0.0-0 -# dev.1.0.0-0 -# dev-1.0.0.0 if [[ $VERSION =~ ^dev[.-]([0-9]+)[.-]([0-9]+)[.-]([0-9]+)[.-]([0-9]+)$ ]]; then + # Example for the regex above: + # dev.1.0.0.0 + # dev-1.0.0-0 + # dev.1.0.0-0 + # dev-1.0.0.0 VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}-beta.${BASH_REMATCH[4]}" elif [[ $VERSION =~ ^([0-9]+)[.-]([0-9]+)[.-]([0-9]+)[.-]dev[.-]([0-9]+)$ ]]; then + # Example for the regex above: + # 1.0.0.dev.0 + # 1.0.0.dev-0 + # 1.0.0-dev-0 + # 1.0.0-dev.0 VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}-beta.${BASH_REMATCH[4]}" elif [[ $VERSION == dev-* ]]; then _temp_part=${VERSION#dev-}