From 9f4e0a2bd0a4a7e51b452f02f2607c5b1175fdb6 Mon Sep 17 00:00:00 2001 From: iammm0 Date: Tue, 27 Jan 2026 14:42:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-build-deploy.yml | 10 +++++----- app-android/gradlew | 0 2 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 app-android/gradlew diff --git a/.github/workflows/docker-build-deploy.yml b/.github/workflows/docker-build-deploy.yml index 11be831..792550c 100644 --- a/.github/workflows/docker-build-deploy.yml +++ b/.github/workflows/docker-build-deploy.yml @@ -3,9 +3,7 @@ name: Docker Build and Deploy on: push: branches: - - main - - master - - develop + - dev/add-agent paths: - 'api/**' - '.github/workflows/**' @@ -87,7 +85,9 @@ jobs: if [ "${{ github.ref_name }}" == "main" ] || [ "${{ github.ref_name }}" == "master" ]; then echo "tag=latest" >> $GITHUB_OUTPUT else - echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT + # 将分支名中的斜杠替换为破折号,以符合 Docker 标签规范 + BRANCH_TAG=$(echo "${{ github.ref_name }}" | sed 's/\//-/g') + echo "tag=$BRANCH_TAG" >> $GITHUB_OUTPUT fi - name: Deploy to remote server @@ -182,4 +182,4 @@ jobs: run: | echo "验证部署状态..." ssh -p $SSH_PORT $SSH_USER@$SSH_HOST \ - "cd $COMPOSE_DIR/api && docker-compose ps && docker-compose logs --tail=50 api" + "cd $COMPOSE_DIR/api && docker-compose ps && docker-compose logs --tail=50 api" \ No newline at end of file diff --git a/app-android/gradlew b/app-android/gradlew old mode 100644 new mode 100755