Merge branch 'main' of https://github.com/bsospace/version-bump

Author: ohmjezzer

.github/workflows/bump-and-release.yml

@@ -2,7 +2,7 @@ name: Bump Version and Create Release
 
 on:
   pull_request:
-    types: closed
+    types: [closed]
     branches:
       - main
       - development
@@ -17,160 +17,120 @@ jobs:
       pull-requests: write
 
     steps:
+      # 1. สร้าง Token ชั่วคราวจาก GitHub App
+      - name: Generate GitHub App Token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      # 2. Checkout โดยใช้ Token ของ App
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
+          token: ${{ steps.app-token.outputs.token }} # ใช้ Token ที่เพิ่งสร้าง
           fetch-depth: 0
 
-      - name: Configure Git
+      # 3. Config Git ให้เป็นตัวตนของ App (Bot Identity)
+      - name: Configure Git Identity
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-
-      - name: Get Current Version from GitHub Releases
+          # ยิง API เพื่อขอข้อมูลของ App Bot ตัวเอง
+          # GitHub App จะมี user type เป็น "Bot" และมี login name เฉพาะ
+          USER_INFO=$(curl -s -H "Authorization: token $GH_TOKEN" https://api.github.com/user)
+          
+          USER_LOGIN=$(echo "$USER_INFO" | jq -r .login)
+          USER_ID=$(echo "$USER_INFO" | jq -r .id)
+          
+          # Email ของ GitHub App Bot จะมี format มาตรฐานคือ: id+name[bot]@users.noreply.github.com
+          USER_EMAIL="${USER_ID}+${USER_LOGIN}@users.noreply.github.com"
+          
+          echo "Configuring Git as: $USER_LOGIN <$USER_EMAIL>"
+          
+          git config user.name "$USER_LOGIN"
+          git config user.email "$USER_EMAIL"
+
+      - name: Get Current Version
         id: current_version
         run: |
-          # Ensure we have tags locally (fetch/prune from origin)
-          git fetch --prune --tags origin
+          LATEST_TAG=$(git tag -l 'v*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n1)
 
-          # Prefer latest tag (including pre-releases) matching semver prefix vMAJOR.MINOR.PATCH
-          LATEST_TAG=$(git tag -l 'v*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n1 || true)
-
-          # if tag latest found
-          if [ -n "$LATEST_TAG" ]; then
-            CURRENT_VERSION="${LATEST_TAG#v}"
-            echo "Found latest tag: $LATEST_TAG"
-          # if tag latest not found
+          if [ -z "$LATEST_TAG" ]; then
+            echo "No tags found. Defaulting to v0.0.0"
+            CURRENT_VERSION="0.0.0"
           else
-            # Fallback to GitHub Releases API if no tags are present
-            LATEST_TAG=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-              https://api.github.com/repos/${{ github.repository }}/releases/latest \
-              | jq -r '.tag_name // empty')
-            
-            # if no releases found
-            if [ -z "$LATEST_TAG" ]; then
-              CURRENT_VERSION="0.1.0"
-              echo "No tags/releases found, using initial version"
-            else
-              CURRENT_VERSION="${LATEST_TAG#v}"
-              echo "Found latest release: $LATEST_TAG"
-            fi
+            echo "Found latest tag: $LATEST_TAG"
+            CURRENT_VERSION="${LATEST_TAG#v}"
           fi
-
           echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
-          echo "Current version: $CURRENT_VERSION"
 
       - name: Calculate New Version
         id: new_version
+        env:
+          CURRENT_VERSION: ${{ steps.current_version.outputs.version }}
+          TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
+          SOURCE_BRANCH: ${{ github.event.pull_request.head.ref }}
         run: |
-          CURRENT=${{ steps.current_version.outputs.version }} 
-          TARGET_BRANCH=${{ github.event.pull_request.base.ref }}
-          SOURCE_BRANCH=${{ github.event.pull_request.head.ref }}
+          echo "Target: $TARGET_BRANCH | Source: $SOURCE_BRANCH | Current: $CURRENT_VERSION"
+          BASE_VERSION=${CURRENT_VERSION%%-*}
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$BASE_VERSION"
+          NEW_VERSION=""
 
-          echo "Target branch: $TARGET_BRANCH"
-          echo "Source branch: $SOURCE_BRANCH"
-
-          # Split version
-          IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT"
-          # ex. 0.1.0-dev* or 0.1.0
-
-          # case hotfix merge to main ex. 0.1.0 -> 0.1.1
+          # === MAIN ===
           if [ "$TARGET_BRANCH" == "main" ]; then
-            echo "On main branch"
-            # split out of text after PATCH -dev* out
-            PATCH=${PATCH%%-*}
-            # ex. 0-dev* -> 0
-            # If source is not a development/, bump patch; otherwise bump minor
-            if [[ "$SOURCE_BRANCH" != "development" ]]; then
-              echo "SOURCE_BRANCH is not development"
-              NEW_MAJOR=$MAJOR
-              NEW_MINOR=$MINOR
-              NEW_PATCH=$((PATCH + 1))
-              NEW_VERSION="$NEW_MAJOR.$NEW_MINOR.$NEW_PATCH"
-              echo "Bumping main: patch bump due to hotfix branch"
-            # if source is development/, bump minor ex. 0.1.0 -> 0.2.0
-            else
-              NEW_MAJOR=$MAJOR
+            if [ "$SOURCE_BRANCH" == "development" ]; then
               NEW_MINOR=$((MINOR + 1))
-              NEW_PATCH=0
-              NEW_VERSION="$NEW_MAJOR.$NEW_MINOR.$NEW_PATCH"
-              echo "Bumping main: minor bump"
+              NEW_VERSION="$MAJOR.$NEW_MINOR.0"
+              echo "Strategy: Minor bump (Release)"
+            else
+              NEW_PATCH=$((PATCH + 1))
+              NEW_VERSION="$MAJOR.$MINOR.$NEW_PATCH"
+              echo "Strategy: Patch bump (Hotfix)"
             fi
 
+          # === DEVELOPMENT ===
           elif [ "$TARGET_BRANCH" == "development" ]; then
-            echo "On development branch"
-            if [[ "$SOURCE_BRANCH" == feat/* ]]; then
-              echo "Bumping development: feature branch"
-              # ถ้า PATCH มี -dev.N อยู่แล้ว ให้เพิ่ม N
-              if [[ "$PATCH" == *"-dev."* ]]; then
-                echo "Feature branch on development with existing dev suffix"
-                DEV_PART=${PATCH#*-dev.}
-                DEV_NUM=${DEV_PART%%-*}
-                DEV_NUM=$((DEV_NUM + 1))
-                # เก็บ prefix ก่อน -dev.N
-                PREFIX=${PATCH%%-dev.*}
-                PATCH="$PREFIX-dev.$DEV_NUM"
-              else
-                echo "Feature branch on development without existing dev suffix"
-                # ถ้าไม่มี -dev.N ให้เริ่มที่ 1
-                PATCH="${PATCH}-dev.1"
-              fi
-
-              NEW_MAJOR=$MAJOR
-              NEW_MINOR=$MINOR
-              NEW_PATCH=$PATCH
-              NEW_VERSION="$NEW_MAJOR.$NEW_MINOR.$NEW_PATCH"
-              echo "Base version for development branch: $NEW_MAJOR.$NEW_MINOR.$NEW_PATCH"
+            if [[ "$CURRENT_VERSION" == *"-dev."* ]]; then
+              LAST_NUM=${CURRENT_VERSION##*.}
+              NEXT_NUM=$((LAST_NUM + 1))
+              NEW_VERSION="${BASE_VERSION}-dev.${NEXT_NUM}"
+            else
+              NEW_VERSION="${BASE_VERSION}-dev.1"
             fi
+            echo "Strategy: Dev increment"
           else
-            echo "Unknown branch: $TARGET_BRANCH"
+            echo "Error: Unknown target branch '$TARGET_BRANCH'"
             exit 1
           fi
 
+          echo "New Version Computed: $NEW_VERSION"
           echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
-          echo "New version: $NEW_VERSION"
-
-      - name: Authenticate with GitHub App
-        uses: tibdex/github-app-token@v2.1.0
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
 
-      - name: Push Changes and Tags
+      - name: Push New Tag
         run: |
           NEW_VERSION=${{ steps.new_version.outputs.version }}
-          git config --global user.name "github-actions"
-          git config --global user.email "github-actions@users.noreply.github.com"
-          git tag "v$NEW_VERSION"
-          git push origin "v$NEW_VERSION"
-        env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
+          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"
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         if: github.event.pull_request.base.ref == 'main'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
+          token: ${{ steps.app-token.outputs.token }} # ใช้ App Token สร้าง Release
           tag_name: v${{ steps.new_version.outputs.version }}
-          name: Release ${{ steps.new_version.outputs.version }} 
+          name: Release ${{ steps.new_version.outputs.version }}
+          generate_release_notes: true
           body: |
-            # Release ${{ steps.new_version.outputs.version }}
-
-            ## Version Bump
-            - Previous Version: ${{ steps.current_version.outputs.version }}
-            - New Version: ${{ steps.new_version.outputs.version }}
-            - Target Branch: ${{ github.event.pull_request.base.ref }}
-
             ## Release Details
-            - PR: #${{ github.event.pull_request.number }}
-            - Title: ${{ github.event.pull_request.title }}
-            - Merged by: @${{ github.event.pull_request.merged_by.login }}
-            - Build: [View Workflow](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
-          draft: false
-          
+            - **Version:** ${{ steps.new_version.outputs.version }}
+            - **Previous:** ${{ steps.current_version.outputs.version }}
+            - **PR:** #${{ github.event.pull_request.number }}
+            - **Branch:** ${{ github.event.pull_request.head.ref }} &rarr; ${{ github.event.pull_request.base.ref }}
+            - **Merged by:** @${{ github.event.pull_request.merged_by.login }}

.github/workflows/deploy-development.yml

@@ -1,16 +1,22 @@
-name: Deploy to Development Environment
+name: Debug Spy
 
 on:
   push:
-    tags:
-      - 'v*-dev.*'
+    tags: ['*']
 
 jobs:
-  deploy-development:
+  spy:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-
-      - name: Notify Deployment Success
-        run: echo "Deployment to development environment completed successfully."
+      - name: Dump GitHub Context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: |
+          echo "=== WHO TRIGGERED THIS? ==="
+          echo "Actor: ${{ github.actor }}"
+          echo "Triggering Actor: ${{ github.triggering_actor }}"
+          echo "Ref (Tag Name): ${{ github.ref }}"
+          echo "Event Name: ${{ github.event_name }}"
+          
+          echo "=== FULL CONTEXT ==="
+          echo "$GITHUB_CONTEXT"

.github/workflows/deploy-production.yml

@@ -0,0 +1,22 @@
+name: Debug Spy
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  spy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dump GitHub Context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: |
+          echo "=== WHO TRIGGERED THIS? ==="
+          echo "Actor: ${{ github.actor }}"
+          echo "Triggering Actor: ${{ github.triggering_actor }}"
+          echo "Ref (Tag Name): ${{ github.ref }}"
+          echo "Event Name: ${{ github.event_name }}"
+          
+          echo "=== FULL CONTEXT ==="
+          echo "$GITHUB_CONTEXT"