Merge pull request #57 from bsospace/development

ohmjezzer · web-flow · commit f60aa6dfe2da · 2025-11-23T16:24:19.000+07:00
test
diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml
@@ -92,12 +92,12 @@ jobs:
 
           # === DEVELOPMENT ===
           elif [ "$TARGET_BRANCH" == "development" ]; then
-            if [[ "$CURRENT_VERSION" == *"-dev."* ]]; then
+            if [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main" ]]; then
               LAST_NUM=${CURRENT_VERSION##*.}
               NEXT_NUM=$((LAST_NUM + 1))
               NEW_VERSION="${BASE_VERSION}-dev.${NEXT_NUM}"
             else
-              NEW_VERSION="${BASE_VERSION}-dev.1"
+              NEW_VERSION="$MAJOR.$((MINOR + 1)).0-dev.1"
             fi
             echo "Strategy: Dev increment"
           else
@@ -113,11 +113,19 @@ jobs:
           NEW_VERSION=${{ steps.new_version.outputs.version }}
           TAG_NAME="v$NEW_VERSION"
           
-          echo "Pushing tag $TAG_NAME"
+          npm version "$NEW_VERSION"
+
+          git push --follow-tags
+      # - name: Push New Tag
+      #   run: |
+      #     NEW_VERSION=${{ steps.new_version.outputs.version }}
+      #     TAG_NAME="v$NEW_VERSION"
+          
+      #     echo "Pushing tag $TAG_NAME"
           
-          git tag -a "$TAG_NAME" -m "Release $TAG_NAME"
-          # Token ถูก set ตั้งแต่ checkout แล้ว จึง push ได้เลย
-          git push origin "$TAG_NAME"
+      #     git tag -a "$TAG_NAME" -m "Release $TAG_NAME"
+      #     # Token ถูก set ตั้งแต่ checkout แล้ว จึง push ได้เลย
+      #     git push origin "$TAG_NAME"
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/index.html b/index.html
@@ -6,6 +6,6 @@
     <title>Document</title>
 </head>
 <body>
-    <h1>Test version hotfix</h1>
+    <h1>Test version</h1>
 </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "version-bump",
+  "version": "0.10.0-dev.6",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bsospace/version-bump.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/bsospace/version-bump/issues"
+  },
+  "homepage": "https://github.com/bsospace/version-bump#readme"
+}
