refactor: Update CI workflows to streamline version bumping and deployment processes. Remove redundant tagging in bump-minor workflow, adjust branch handling in static analysis, and enhance build and deploy conditions for better clarity and efficiency.

Author: madMathematician971

.github/workflows/bump-minor.yml

@@ -27,5 +27,4 @@ jobs:
           git config user.email "actions@github.com"
           git add pyproject.toml
           git commit -m "ci: bump minor version to v${{ env.VERSION }} [skip ci]" || echo "No changes"
-          git tag v${{ env.VERSION }} || echo "Tag exists"
-          git push origin HEAD:main --follow-tags
+          git push origin HEAD:main

.github/workflows/ci-analysis.yml

@@ -2,6 +2,9 @@ name: Static Analysis
 
 on:
   push:
+    branches-ignore:
+      - main
+      - 'release/*'
   pull_request:
   workflow_dispatch:
 

.github/workflows/ci-build.yml

@@ -1,20 +1,31 @@
 name: Build
 
 on:
+  pull_request:
+    branches:
+      - develop
+      - main
   workflow_run:
     workflows:
-      - CI StaticAnalysis
+      - Static Analysis
     types:
       - completed
 
 jobs:
   build:
     if: >-
-      github.event.workflow_run.conclusion == 'success' &&
-      (
-        startsWith(github.event.workflow_run.head_branch, 'main') ||
-        startsWith(github.event.workflow_run.head_branch, 'develop') ||
-        startsWith(github.event.workflow_run.head_branch, 'release/')
+      (github.event_name == 'workflow_run' &&
+        github.event.workflow_run.conclusion == 'success' &&
+        (
+          startsWith(github.event.workflow_run.head_branch, 'main') ||
+          startsWith(github.event.workflow_run.head_branch, 'develop')
+        )
+      ) ||
+      (github.event_name == 'pull_request' &&
+        (
+          github.event.pull_request.base.ref == 'main' ||
+          github.event.pull_request.base.ref == 'develop'
+        )
       )
     environment: staging
     name: Build FastMCP Docker Image

.github/workflows/ci-deploy.yml

@@ -1,77 +1,87 @@
 name: Deploy
 
 on:
+  push:
+    branches:
+      - 'release/*'
   workflow_run:
     workflows:
-      - Build
       - Bump Minor Version
     types:
       - completed
 
 jobs:
-  deploy_images:
-    name: Deploy Docker Images
-    if: >-
-      github.event.workflow_run.conclusion == 'success' &&
-      startsWith(github.event.workflow_run.head_branch, 'release/')
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install uv and dev dependencies
-        run: |
-          curl -LsSf https://astral.sh/uv/install.sh | sh
-          uv sync --only-dev
-      - name: Extract version
-        id: extract_version
-        run: |
-          echo "VERSION=$(poetry version -s)" >> $GITHUB_ENV
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push FastMCP image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          target: fastmcp
-          push: true
-          tags: |
-            madmathematician971/mcp-it-tools-fastmcp:latest
-            madmathematician971/mcp-it-tools-fastmcp:${{ env.VERSION }}
-
   create_release:
-    name: Create Release Tag
+    name: Create Release and Tag
     if: >-
       github.event.workflow_run.conclusion == 'success' &&
       github.event.workflow_run.head_branch == 'main'
     runs-on: ubuntu-latest
     environment: production
     steps:
       - uses: actions/checkout@v4
+
       - name: Install uv and dev dependencies
         run: |
           curl -LsSf https://astral.sh/uv/install.sh | sh
           uv sync --only-dev
+
       - name: Extract version
         id: extract_version
         run: |
           echo "VERSION=$(poetry version -s)" >> $GITHUB_ENV
-      - name: Create and push Git tag
-        run: |
-          git config user.name "github-actions"
-          git config user.email "actions@github.com"
-          git tag v${{ env.VERSION }}
-          git push origin v${{ env.VERSION }}
+
       - name: Create GitHub Release
         uses: actions/create-release@v1
         with:
           tag_name: v${{ env.VERSION }}
           release_name: v${{ env.VERSION }}
           body: "Release v${{ env.VERSION }}"
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                
+      - name: Create and push release branch
+        run: |
+          git config user.name "github-actions"
+          git config user.email "actions@github.com"
+          git checkout -b "release/v${{ env.VERSION }}"
+          git push origin "release/v${{ env.VERSION }}"
+
+  deploy_images:
+    name: Deploy Docker Images
+    if: >-
+        github.event_name == 'push' &&
+        startsWith(github.ref, 'refs/heads/release/')
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+        - uses: actions/checkout@v4
+
+        - name: Install uv and dev dependencies
+          run: |
+            curl -LsSf https://astral.sh/uv/install.sh | sh
+            uv sync --only-dev
+
+        - name: Extract version
+          id: extract_version
+          run: |
+              echo "VERSION=$(poetry version -s)" >> $GITHUB_ENV
+
+        - name: Log in to Docker Hub
+          uses: docker/login-action@v2
+          with:
+              username: ${{ secrets.DOCKERHUB_USERNAME }}
+              password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+        - name: Set up Docker Buildx
+          uses: docker/setup-buildx-action@v3
+
+        - name: Build and push FastMCP image
+          uses: docker/build-push-action@v5
+          with:
+            context: .
+            target: fastmcp
+            push: true
+            tags: |
+              madmathematician971/mcp-it-tools-fastmcp:latest
+              madmathematician971/mcp-it-tools-fastmcp:${{ env.VERSION }}