update ci

Author: Charm

.github/workflows/build-and-push.yml

@@ -2,13 +2,13 @@ name: Build and Push Docker Images
 
 on:
   push:
-    branches:
-      - main
+    # branches:
+    #   - main
     tags:
       - "v*"
-  pull_request:
-    branches:
-      - main
+  # pull_request:
+  #   branches:
+  #     - main
 
 env:
   DOCKERHUB_USERNAME: charmy1220
@@ -43,35 +43,27 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Log in to Docker Hub
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ env.DOCKERHUB_USERNAME }}
           password: ${{ env.DOCKERHUB_TOKEN }}
 
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.DOCKERHUB_USERNAME }}/${{ matrix.service.image }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=raw,value=latest,enable={{is_default_branch}}
+      - name: Extract tag name
+        id: extract_tag
+        run: |
+          TAG_NAME=${GITHUB_REF#refs/tags/}
+          echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
+          echo "Extracted tag: $TAG_NAME"
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         timeout-minutes: 30
         with:
           context: ${{ matrix.service.context }}
           file: ${{ matrix.service.dockerfile }}
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.DOCKERHUB_USERNAME }}/${{ matrix.service.image }}:${{ steps.extract_tag.outputs.tag_name }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           platforms: linux/amd64
@@ -82,49 +74,50 @@ jobs:
     needs: build-and-push
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/v')
+    permissions:
+      contents: write
+      discussions: write
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Extract tag name
+        id: extract_tag
+        run: |
+          TAG_NAME=${GITHUB_REF#refs/tags/}
+          echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
+          echo "Current tag: $TAG_NAME"
+
       - name: Generate changelog
         id: changelog
         run: |
-          # get current tag and previous tag
-          CURRENT_TAG=${GITHUB_REF#refs/tags/}
+          CURRENT_TAG=${{ steps.extract_tag.outputs.tag_name }}
           PREVIOUS_TAG=$(git describe --tags --abbrev=0 HEAD~1 2>/dev/null || echo "")
 
-          echo "current_tag=$CURRENT_TAG" >> $GITHUB_OUTPUT
+          echo "## 🚀 Release $CURRENT_TAG" > CHANGELOG.md
+          echo "" >> CHANGELOG.md
+          echo "### 📦 Docker Images" >> CHANGELOG.md
+          echo "- \`${{ env.DOCKERHUB_USERNAME }}/lmeterx-be:$CURRENT_TAG\`" >> CHANGELOG.md
+          echo "- \`${{ env.DOCKERHUB_USERNAME }}/lmeterx-eng:$CURRENT_TAG\`" >> CHANGELOG.md
+          echo "- \`${{ env.DOCKERHUB_USERNAME }}/lmeterx-fe:$CURRENT_TAG\`" >> CHANGELOG.md
+          echo "" >> CHANGELOG.md
 
-          # generate changelog
           if [ -n "$PREVIOUS_TAG" ]; then
-            echo "## 🚀 Changes in $CURRENT_TAG" > CHANGELOG.md
-            echo "" >> CHANGELOG.md
-            echo "### 📦 Docker Images" >> CHANGELOG.md
-            echo "- \`${{ env.DOCKERHUB_USERNAME }}/lmeterx-be:$CURRENT_TAG\`" >> CHANGELOG.md
-            echo "- \`${{ env.DOCKERHUB_USERNAME }}/lmeterx-eng:$CURRENT_TAG\`" >> CHANGELOG.md
-            echo "- \`${{ env.DOCKERHUB_USERNAME }}/lmeterx-fe:$CURRENT_TAG\`" >> CHANGELOG.md
-            echo "" >> CHANGELOG.md
-            echo "### 📝 Commits" >> CHANGELOG.md
+            echo "### 📝 Changes since $PREVIOUS_TAG" >> CHANGELOG.md
             git log --pretty=format:"- %s (%h)" $PREVIOUS_TAG..$CURRENT_TAG >> CHANGELOG.md
           else
-            echo "## 🚀 Release $CURRENT_TAG" > CHANGELOG.md
-            echo "" >> CHANGELOG.md
-            echo "### 📦 Docker Images" >> CHANGELOG.md
-            echo "- \`${{ env.DOCKERHUB_USERNAME }}/lmeterx-be:$CURRENT_TAG\`" >> CHANGELOG.md
-            echo "- \`${{ env.DOCKERHUB_USERNAME }}/lmeterx-eng:$CURRENT_TAG\`" >> CHANGELOG.md
-            echo "- \`${{ env.DOCKERHUB_USERNAME }}/lmeterx-fe:$CURRENT_TAG\`" >> CHANGELOG.md
-            echo "" >> CHANGELOG.md
-            echo "Initial release" >> CHANGELOG.md
+            echo "### 📝 Initial Release" >> CHANGELOG.md
+            echo "This is the initial release of LMeterX." >> CHANGELOG.md
           fi
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ steps.changelog.outputs.current_tag }}
-          name: Release ${{ steps.changelog.outputs.current_tag }}
+          tag_name: ${{ steps.extract_tag.outputs.tag_name }}
+          name: Release ${{ steps.extract_tag.outputs.tag_name }}
           body_path: CHANGELOG.md
           draft: false
           prerelease: false
@@ -134,7 +127,7 @@ jobs:
 
       - name: Update docker-compose.yml
         run: |
-          CURRENT_TAG=${GITHUB_REF#refs/tags/}
+          CURRENT_TAG=${{ steps.extract_tag.outputs.tag_name }}
 
           # update docker-compose.yml with new image tags
           sed -i "s|${{ env.DOCKERHUB_USERNAME }}/lmeterx-be:.*|${{ env.DOCKERHUB_USERNAME }}/lmeterx-be:$CURRENT_TAG|g" docker-compose.yml
@@ -146,7 +139,7 @@ jobs:
           git config --local user.email "[email protected]"
           git config --local user.name "GitHub Action"
           git add docker-compose.yml
-          git diff --staged --quiet || git commit -m "Update docker-compose.yml to use ${{ steps.changelog.outputs.current_tag }} images"
+          git diff --staged --quiet || git commit -m "Update docker-compose.yml to use ${{ steps.extract_tag.outputs.tag_name }} images"
           git push origin HEAD:main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/manual-build.yml

@@ -63,19 +63,9 @@ jobs:
           VERSION=${{ inputs.version }}
           IMAGE_NAME="${{ env.REGISTRY }}/${{ env.DOCKERHUB_USERNAME }}/${{ matrix.service.image }}"
 
-          # 生成标签
+          # 只生成用户指定的版本标签
           TAGS="${IMAGE_NAME}:${VERSION}"
 
-          # 如果是语义化版本，添加额外标签
-          if [[ $VERSION =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            MAJOR_MINOR=$(echo $VERSION | sed 's/v\([0-9]*\.[0-9]*\)\.[0-9]*/v\1/')
-            MAJOR=$(echo $VERSION | sed 's/v\([0-9]*\)\.[0-9]*\.[0-9]*/v\1/')
-            TAGS="${TAGS},${IMAGE_NAME}:${MAJOR_MINOR},${IMAGE_NAME}:${MAJOR}"
-          fi
-
-          # 添加latest标签（如果需要）
-          TAGS="${TAGS},${IMAGE_NAME}:latest"
-
           echo "tags=${TAGS}" >> $GITHUB_OUTPUT
           echo "Generated tags: ${TAGS}"
 
@@ -94,12 +84,31 @@ jobs:
     needs: build-and-push
     runs-on: ubuntu-latest
     if: inputs.create_release
+    permissions:
+      contents: write
+      discussions: write
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check if tag exists
+        id: check_tag
+        run: |
+          VERSION=${{ inputs.version }}
+          if git rev-parse "refs/tags/$VERSION" >/dev/null 2>&1; then
+            echo "Tag $VERSION already exists locally"
+            git tag -d $VERSION || true
+          fi
+
+          # Check if tag exists on remote
+          if git ls-remote --tags origin | grep -q "refs/tags/$VERSION"; then
+            echo "Tag $VERSION exists on remote, deleting it"
+            git push origin --delete $VERSION || true
+          fi
 
       - name: Create tag
         run: |
@@ -133,6 +142,17 @@ jobs:
             echo "This is the initial release of LMeterX." >> CHANGELOG.md
           fi
 
+      - name: Delete existing release if exists
+        run: |
+          VERSION=${{ inputs.version }}
+          # Check if release exists and delete it
+          if gh release view $VERSION >/dev/null 2>&1; then
+            echo "Release $VERSION exists, deleting it"
+            gh release delete $VERSION --yes
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v1
         with:
@@ -142,6 +162,7 @@ jobs:
           draft: false
           prerelease: false
           generate_release_notes: true
+          fail_on_unmatched_files: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}