From cbc68e8573c87193971d5ca1367ce544a1723e37 Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 16:32:43 +0700 Subject: [PATCH 01/18] feat: test --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 32187c2..d68a43f 100644 --- a/index.html +++ b/index.html @@ -7,5 +7,6 @@

Test version

+ \ No newline at end of file From 5bf6346b3090167d86d47f7fc18c72d7c40275c3 Mon Sep 17 00:00:00 2001 From: null Date: Sun, 23 Nov 2025 09:33:29 +0000 Subject: [PATCH 02/18] 0.10.0-dev.7 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f0fe53..7c889f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "version-bump", - "version": "0.10.0-dev.6", + "version": "0.10.0-dev.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "version-bump", - "version": "0.10.0-dev.6", + "version": "0.10.0-dev.7", "license": "ISC" } } diff --git a/package.json b/package.json index 8fc4174..c00d464 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "version-bump", - "version": "0.10.0-dev.6", + "version": "0.10.0-dev.7", "description": "", "main": "index.js", "scripts": { From 43a21f7dc7cacc5dd9c43b1d53efa8679c8c90e3 Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 16:58:12 +0700 Subject: [PATCH 03/18] fix: test pipeline --- .github/workflows/bump-and-release.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 7d23fa6..cda8608 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -55,7 +55,16 @@ jobs: - name: Get Current Version id: current_version run: | - LATEST_TAG=$(git tag -l 'v*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n1) + # get only no -dev + LATEST_TAG=$(git tag -l 'v*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -n1) + LATEST_TAG_DAV=$(git tag -l 'v*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+-dev\.[0-9]+' | sort -V | tail -n1) + + LATEST_TAG_DAV_REMOVED=${LATEST_TAG_DAV%%-*} + + same_tag=true + if [[ "$LATEST_TAG_DAV_REMOVED" != "$LATEST_TAG" ]]; then + echo "same_tag=false" >> $GITHUB_OUTPUT + fi if [ -z "$LATEST_TAG" ]; then echo "No tags found. Defaulting to v0.0.0" @@ -91,7 +100,7 @@ jobs: # === DEVELOPMENT === elif [ "$TARGET_BRANCH" == "development" ]; then - if [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main" ]]; then + if [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main" && ${{ steps.current_version.outputs.same_tag }} == 'false' ]]; then LAST_NUM=${CURRENT_VERSION##*.} NEXT_NUM=$((LAST_NUM + 1)) NEW_VERSION="${BASE_VERSION}-dev.${NEXT_NUM}" From ca5418b4284f0b90afeb9e8052b06f65955f8c06 Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:00:54 +0700 Subject: [PATCH 04/18] fix: test pipeline --- .github/workflows/bump-and-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index cda8608..c03b0ee 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -81,6 +81,7 @@ jobs: CURRENT_VERSION: ${{ steps.current_version.outputs.version }} TARGET_BRANCH: ${{ github.event.pull_request.base.ref }} SOURCE_BRANCH: ${{ github.event.pull_request.head.ref }} + SAME_TAG: ${{ steps.current_version.outputs.same_tag }} run: | echo "Target: $TARGET_BRANCH | Source: $SOURCE_BRANCH | Current: $CURRENT_VERSION" BASE_VERSION=${CURRENT_VERSION%%-*} @@ -100,7 +101,7 @@ jobs: # === DEVELOPMENT === elif [ "$TARGET_BRANCH" == "development" ]; then - if [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main" && ${{ steps.current_version.outputs.same_tag }} == 'false' ]]; then + if [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main" && $SAME_TAG == 'false' ]]; then LAST_NUM=${CURRENT_VERSION##*.} NEXT_NUM=$((LAST_NUM + 1)) NEW_VERSION="${BASE_VERSION}-dev.${NEXT_NUM}" From 5d6ce69c1fd7135df2c590715f769feb390c39c0 Mon Sep 17 00:00:00 2001 From: null Date: Sun, 23 Nov 2025 10:01:33 +0000 Subject: [PATCH 05/18] 0.11.0-dev.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7c889f7..d2bc49b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "version-bump", - "version": "0.10.0-dev.7", + "version": "0.11.0-dev.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "version-bump", - "version": "0.10.0-dev.7", + "version": "0.11.0-dev.1", "license": "ISC" } } diff --git a/package.json b/package.json index c00d464..f5fc9fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "version-bump", - "version": "0.10.0-dev.7", + "version": "0.11.0-dev.1", "description": "", "main": "index.js", "scripts": { From 45457e3a5ba9133045dec29e718f6643cf8b7e4f Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:10:25 +0700 Subject: [PATCH 06/18] test: fix --- .github/workflows/bump-and-release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index c03b0ee..31296f1 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -63,8 +63,10 @@ jobs: same_tag=true if [[ "$LATEST_TAG_DAV_REMOVED" != "$LATEST_TAG" ]]; then - echo "same_tag=false" >> $GITHUB_OUTPUT + same_tag=false fi + + echo "same_tag=$same_tag" >> $GITHUB_OUTPUT if [ -z "$LATEST_TAG" ]; then echo "No tags found. Defaulting to v0.0.0" From 606532c41e3c68763c8b119bda123ddaffb57e00 Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:13:42 +0700 Subject: [PATCH 07/18] fix: test --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8fc4174..50d95e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "version-bump", - "version": "0.10.0-dev.6", + "version": "v0.10.0-dev.7", "description": "", "main": "index.js", "scripts": { From 6a180afce1c82b6f19aeae127926644e7131b15a Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:15:26 +0700 Subject: [PATCH 08/18] fix: test --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index d68a43f..ee3f921 100644 --- a/index.html +++ b/index.html @@ -8,5 +8,6 @@

Test version

+ \ No newline at end of file From 64819ccdad9df70364f723a9882735a55c839621 Mon Sep 17 00:00:00 2001 From: null Date: Sun, 23 Nov 2025 10:16:16 +0000 Subject: [PATCH 09/18] 0.11.0-dev.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 50d95e6..f5fc9fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "version-bump", - "version": "v0.10.0-dev.7", + "version": "0.11.0-dev.1", "description": "", "main": "index.js", "scripts": { From 8bbfe650a83509500387a7fd885d4e257ddec81a Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:17:03 +0700 Subject: [PATCH 10/18] fix: test --- index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.html b/index.html index ee3f921..32187c2 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,5 @@

Test version

- - \ No newline at end of file From 0cdd867d8e0fb3f4261cea9fc31e2f162a7ce0f4 Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:30:58 +0700 Subject: [PATCH 11/18] fix: test --- .github/workflows/bump-and-release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 31296f1..9c4b8bd 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -103,12 +103,14 @@ jobs: # === DEVELOPMENT === elif [ "$TARGET_BRANCH" == "development" ]; then - if [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main" && $SAME_TAG == 'false' ]]; then + if [[ "$CURRENT_VERSION" == *"-dev."* && "$SAME_TAG" == "true" ]]; then + NEW_VERSION="$MAJOR.$((MINOR + 1)).0-dev.1" + else if [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main"]] LAST_NUM=${CURRENT_VERSION##*.} NEXT_NUM=$((LAST_NUM + 1)) NEW_VERSION="${BASE_VERSION}-dev.${NEXT_NUM}" else - NEW_VERSION="$MAJOR.$((MINOR + 1)).0-dev.1" + echo "Strategy: Dev increment" fi echo "Strategy: Dev increment" else From ce04a007e813641a7b1eae439ae245cd950da0e9 Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:36:49 +0700 Subject: [PATCH 12/18] fix: test --- .github/workflows/bump-and-release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 9c4b8bd..e0ae801 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -73,7 +73,11 @@ jobs: CURRENT_VERSION="0.0.0" else echo "Found latest tag: $LATEST_TAG" - CURRENT_VERSION="${LATEST_TAG#v}" + if: [ same_tag == "true" ] + CURRENT_VERSION="${LATEST_TAG_DAV#v}" + else + CURRENT_VERSION="${LATEST_TAG#v}" + fi fi echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT From b132ae01b3f49ecbd40de7543106f0ce684b737c Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:38:09 +0700 Subject: [PATCH 13/18] fix: test --- .github/workflows/bump-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index e0ae801..5656b4f 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -73,7 +73,7 @@ jobs: CURRENT_VERSION="0.0.0" else echo "Found latest tag: $LATEST_TAG" - if: [ same_tag == "true" ] + if [ "$same_tag" == "true" ] CURRENT_VERSION="${LATEST_TAG_DAV#v}" else CURRENT_VERSION="${LATEST_TAG#v}" From 6d3cbf55c1724f52f4bc193576044ad3799b531c Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:40:43 +0700 Subject: [PATCH 14/18] fix: test --- .github/workflows/bump-and-release.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 5656b4f..5bdbd22 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -55,30 +55,37 @@ jobs: - name: Get Current Version id: current_version run: | - # get only no -dev + # 1. หา Tag LATEST_TAG=$(git tag -l 'v*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -n1) LATEST_TAG_DAV=$(git tag -l 'v*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+-dev\.[0-9]+' | sort -V | tail -n1) + # 2. ตัด suffix ของ Dev ออกเพื่อเทียบ LATEST_TAG_DAV_REMOVED=${LATEST_TAG_DAV%%-*} - same_tag=true + # 3. Logic เช็ค same_tag + same_tag="true" if [[ "$LATEST_TAG_DAV_REMOVED" != "$LATEST_TAG" ]]; then - same_tag=false + same_tag="false" fi echo "same_tag=$same_tag" >> $GITHUB_OUTPUT + # 4. กำหนด CURRENT_VERSION if [ -z "$LATEST_TAG" ]; then echo "No tags found. Defaulting to v0.0.0" CURRENT_VERSION="0.0.0" else echo "Found latest tag: $LATEST_TAG" - if [ "$same_tag" == "true" ] + + # --- จุดที่แก้ไข (เพิ่ม ; then) --- + if [ "$same_tag" == "true" ]; then CURRENT_VERSION="${LATEST_TAG_DAV#v}" else CURRENT_VERSION="${LATEST_TAG#v}" fi + # ----------------------------- fi + echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT - name: Calculate New Version From dcef0d174a0b435e9327417e9c174a1963d2e2c5 Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:42:33 +0700 Subject: [PATCH 15/18] fix: test --- .github/workflows/bump-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 5bdbd22..37e167e 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -116,7 +116,7 @@ jobs: elif [ "$TARGET_BRANCH" == "development" ]; then if [[ "$CURRENT_VERSION" == *"-dev."* && "$SAME_TAG" == "true" ]]; then NEW_VERSION="$MAJOR.$((MINOR + 1)).0-dev.1" - else if [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main"]] + else if [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main"]]; then LAST_NUM=${CURRENT_VERSION##*.} NEXT_NUM=$((LAST_NUM + 1)) NEW_VERSION="${BASE_VERSION}-dev.${NEXT_NUM}" From bc430809803a11b9b74c6648a06da9e5b819c732 Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:50:05 +0700 Subject: [PATCH 16/18] fix: test --- .github/workflows/bump-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 37e167e..8f55e23 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -116,7 +116,7 @@ jobs: elif [ "$TARGET_BRANCH" == "development" ]; then if [[ "$CURRENT_VERSION" == *"-dev."* && "$SAME_TAG" == "true" ]]; then NEW_VERSION="$MAJOR.$((MINOR + 1)).0-dev.1" - else if [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main"]]; then + elif [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main" ]]; then LAST_NUM=${CURRENT_VERSION##*.} NEXT_NUM=$((LAST_NUM + 1)) NEW_VERSION="${BASE_VERSION}-dev.${NEXT_NUM}" From 1014a49f5e2c3a1d486f9666ebf73b5b029b9adb Mon Sep 17 00:00:00 2001 From: ohmjezzer Date: Sun, 23 Nov 2025 17:53:13 +0700 Subject: [PATCH 17/18] fix: test --- .github/workflows/bump-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 8f55e23..0503c72 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -78,7 +78,7 @@ jobs: echo "Found latest tag: $LATEST_TAG" # --- จุดที่แก้ไข (เพิ่ม ; then) --- - if [ "$same_tag" == "true" ]; then + if [ "$same_tag" == "false" ]; then CURRENT_VERSION="${LATEST_TAG_DAV#v}" else CURRENT_VERSION="${LATEST_TAG#v}" From 62295b6a2ee03a7942e3523739020d2bfe17896c Mon Sep 17 00:00:00 2001 From: null Date: Sun, 23 Nov 2025 10:53:43 +0000 Subject: [PATCH 18/18] 0.11.0-dev.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d2bc49b..885bfdb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "version-bump", - "version": "0.11.0-dev.1", + "version": "0.11.0-dev.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "version-bump", - "version": "0.11.0-dev.1", + "version": "0.11.0-dev.2", "license": "ISC" } } diff --git a/package.json b/package.json index f5fc9fa..c687bf9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "version-bump", - "version": "0.11.0-dev.1", + "version": "0.11.0-dev.2", "description": "", "main": "index.js", "scripts": {