From 943faf0ba99dff400c001ace1c4205f70b415a26 Mon Sep 17 00:00:00 2001 From: cat-shark <1716967236@qq.com> Date: Mon, 20 Jul 2026 22:47:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(ci):=20=E9=99=90=E5=88=B6=E4=BB=85=20main?= =?UTF-8?q?=20=E9=83=A8=E7=BD=B2=E5=B9=B6=E5=8A=A0=E5=9B=BA=20IMAGE=5FTAG?= =?UTF-8?q?=20=E4=BC=A0=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - lpt-ai 仅 main/master 可部署;dev/prod 靠 environment 区分 namespace - IMAGE_TAG 写 env 文件 + 工作区文件兜底 Co-Authored-By: Claude Opus 4.8 (1M context) --- .gitea/workflows/deploy.yml | 114 ++++++++++++++++++++++++++++-------- 1 file changed, 91 insertions(+), 23 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 7d7c310..e590fb3 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: environment: - description: '部署环境' + description: '部署环境(本仓库仅 main 分支;dev/prod 均从 main 部署)' required: true type: choice options: @@ -20,25 +20,70 @@ jobs: build-and-deploy: runs-on: ubuntu-latest steps: + - name: Validate branch ↔ environment + run: | + set -euo pipefail + REF="${{ gitea.ref }}" + BRANCH="${REF#refs/heads/}" + if [[ "$REF" == refs/tags/* ]]; then + echo "ERROR: 请从分支触发部署,不要用 tag。当前 ref=$REF" + exit 1 + fi + ENV="${{ inputs.environment }}" + echo "branch=$BRANCH environment=$ENV sha=${{ gitea.sha }}" + # lpt-ai 仅维护 main:dev/prod 都从 main 出包,靠 environment 区分 namespace/镜像 tag + case "$BRANCH" in + main|master) + echo "OK: lpt-ai 从 $BRANCH 部署到 $ENV" + ;; + *) + echo "ERROR: lpt-ai 只能从 main/master 部署,当前分支是 '$BRANCH'" + exit 1 + ;; + esac + case "$ENV" in + dev|prod) ;; + *) + echo "ERROR: 未知 environment=$ENV" + exit 1 + ;; + esac + - name: Checkout code run: | - git clone $REPO_URL . - git checkout ${{ gitea.sha }} + set -euo pipefail + git clone "$REPO_URL" . + git checkout "${{ gitea.sha }}" - name: Login to Docker Registry run: | - echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login $REGISTRY -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin + set -euo pipefail + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login "$REGISTRY" -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin - name: Build & Push Docker image run: | - TAG=${{ gitea.sha }}-$(date +%s) - docker build -t $REGISTRY/$APP:$TAG -t $REGISTRY/$APP:${{ inputs.environment }} . - docker push $REGISTRY/$APP:$TAG - docker push $REGISTRY/$APP:${{ inputs.environment }} - echo "IMAGE_TAG=$TAG" >> $GITHUB_ENV + set -euo pipefail + ENV="${{ inputs.environment }}" + TAG="${{ gitea.sha }}-$(date +%s)" + echo "Building $REGISTRY/$APP:$TAG (env tag=$ENV)" + docker build -t "$REGISTRY/$APP:$TAG" -t "$REGISTRY/$APP:$ENV" . + docker push "$REGISTRY/$APP:$TAG" + docker push "$REGISTRY/$APP:$ENV" + if [ -n "${GITHUB_ENV:-}" ]; then + echo "IMAGE_TAG=$TAG" >> "$GITHUB_ENV" + fi + if [ -n "${GITEA_ENV:-}" ]; then + echo "IMAGE_TAG=$TAG" >> "$GITEA_ENV" + fi + echo "$TAG" > image_tag.txt + if [ -n "${{ runner.temp }}" ]; then + echo "$TAG" > "${{ runner.temp }}/image_tag.txt" || true + fi + echo "IMAGE_TAG=$TAG" - name: Setup kubectl run: | + set -euo pipefail curl -sLO "https://dl.k8s.io/release/v1.30.0/bin/linux/amd64/kubectl" chmod +x kubectl mv kubectl /usr/local/bin/ @@ -47,39 +92,62 @@ jobs: - name: Create/Update imagePullSecret run: | + set -euo pipefail kubectl create secret docker-registry regcred \ - --docker-server=$REGISTRY \ + --docker-server="$REGISTRY" \ --docker-username="${{ secrets.REGISTRY_USERNAME }}" \ --docker-password="${{ secrets.REGISTRY_PASSWORD }}" \ - -n lpt-${{ inputs.environment }} \ + -n "lpt-${{ inputs.environment }}" \ --dry-run=client -o yaml | kubectl apply -f - - name: Deploy to K8s run: | - kubectl set image deployment/$APP $APP=$REGISTRY/$APP:$IMAGE_TAG -n lpt-${{ inputs.environment }} --record - kubectl rollout status deployment/$APP -n lpt-${{ inputs.environment }} --timeout=5m + set -euo pipefail + ENV="${{ inputs.environment }}" + IMAGE_TAG="${IMAGE_TAG:-}" + if [ -z "$IMAGE_TAG" ] && [ -f image_tag.txt ]; then + IMAGE_TAG="$(cat image_tag.txt)" + fi + if [ -z "$IMAGE_TAG" ] && [ -f "${{ runner.temp }}/image_tag.txt" ]; then + IMAGE_TAG="$(cat "${{ runner.temp }}/image_tag.txt")" + fi + if [ -z "$IMAGE_TAG" ]; then + echo "ERROR: IMAGE_TAG 为空,无法部署" + exit 1 + fi + echo "Deploying $REGISTRY/$APP:$IMAGE_TAG -> namespace lpt-$ENV" + kubectl set image "deployment/$APP" \ + "$APP=$REGISTRY/$APP:$IMAGE_TAG" \ + -n "lpt-$ENV" --record + kubectl rollout status "deployment/$APP" \ + -n "lpt-$ENV" --timeout=5m - name: Debug on failure if: failure() run: | + ENV="${{ inputs.environment }}" echo "=== Deployment Status ===" - kubectl get deployment $APP -n lpt-${{ inputs.environment }} + kubectl get deployment "$APP" -n "lpt-$ENV" || true echo "" echo "=== Pod Status ===" - kubectl get pods -n lpt-${{ inputs.environment }} -l app=$APP + kubectl get pods -n "lpt-$ENV" -l "app=$APP" || true echo "" echo "=== Recent Events ===" - kubectl get events -n lpt-${{ inputs.environment }} --sort-by='.lastTimestamp' | tail -20 + kubectl get events -n "lpt-$ENV" --sort-by='.lastTimestamp' | tail -20 || true echo "" echo "=== Pod Describe (latest) ===" - POD=$(kubectl get pods -n lpt-${{ inputs.environment }} -l app=$APP --sort-by=.metadata.creationTimestamp -o jsonpath='{.items[-1].metadata.name}') - kubectl describe pod $POD -n lpt-${{ inputs.environment }} || true - echo "" - echo "=== Pod Logs (latest) ===" - kubectl logs $POD -n lpt-${{ inputs.environment }} --tail=50 || true + POD=$(kubectl get pods -n "lpt-$ENV" -l "app=$APP" --sort-by=.metadata.creationTimestamp -o jsonpath='{.items[-1].metadata.name}' 2>/dev/null || true) + if [ -n "${POD:-}" ]; then + kubectl describe pod "$POD" -n "lpt-$ENV" || true + echo "" + echo "=== Pod Logs (latest) ===" + kubectl logs "$POD" -n "lpt-$ENV" --tail=50 || true + fi - name: Rollback on failure if: failure() run: | - kubectl rollout undo deployment/$APP -n lpt-${{ inputs.environment }} - kubectl rollout status deployment/$APP -n lpt-${{ inputs.environment }} + set -euo pipefail + ENV="${{ inputs.environment }}" + kubectl rollout undo "deployment/$APP" -n "lpt-$ENV" || true + kubectl rollout status "deployment/$APP" -n "lpt-$ENV" || true