From f3a7259a059d3464cd359f7ceccff84d530aae0d Mon Sep 17 00:00:00 2001 From: csh Date: Fri, 15 May 2026 17:14:16 +0800 Subject: [PATCH] :wrench: chore(ci): use prepare_repo.sh in both workflows Replace duplicated inline checkout logic in standards-check.yml and test.yml with a call to .gitea/ci/prepare_repo.sh. Also remove the unused TEST_WORKSPACE env var from test.yml. Co-Authored-By: Claude Opus 4.7 (1M context) --- .gitea/workflows/standards-check.yml | 53 ++++----------------------- .gitea/workflows/test.yml | 55 ++++------------------------ 2 files changed, 14 insertions(+), 94 deletions(-) diff --git a/.gitea/workflows/standards-check.yml b/.gitea/workflows/standards-check.yml index f7ff140a..ec17dd3a 100644 --- a/.gitea/workflows/standards-check.yml +++ b/.gitea/workflows/standards-check.yml @@ -23,52 +23,13 @@ jobs: steps: - name: 📥 准备仓库 - run: | - echo "========================================" - echo "📥 准备仓库到 WORKSPACE_DIR" - echo "========================================" - - REPO_NAME="${{ github.event.repository.name }}" - REPO_DIR="${{ env.WORKSPACE_DIR }}/$REPO_NAME" - TOKEN="${{ secrets.WORKFLOW }}" - if [ -n "$TOKEN" ]; then - REPO_URL="https://oauth2:${TOKEN}@${GITHUB_SERVER_URL#https://}/${{ github.repository }}.git" - else - REPO_URL="${GITHUB_SERVER_URL}/${{ github.repository }}.git" - fi - - if [ -d "$REPO_DIR" ]; then - if [ -d "$REPO_DIR/.git" ]; then - cd "$REPO_DIR" - git clean -fdx - git reset --hard - git fetch --all --tags --force --prune --prune-tags - else - rm -rf "$REPO_DIR" - fi - fi - - if [ ! -d "$REPO_DIR/.git" ]; then - mkdir -p "${{ env.WORKSPACE_DIR }}" - git clone "$REPO_URL" "$REPO_DIR" - cd "$REPO_DIR" - fi - - TARGET_SHA="${{ github.sha }}" - TARGET_REF="${{ github.ref }}" - if git cat-file -e "$TARGET_SHA^{commit}" 2>/dev/null; then - git checkout -f "$TARGET_SHA" - else - if [ -n "$TARGET_REF" ]; then - git fetch origin "$TARGET_REF" - git checkout -f FETCH_HEAD - else - git checkout -f "${{ github.ref_name }}" - fi - fi - - git config --global --add safe.directory "$REPO_DIR" - echo "REPO_DIR=$REPO_DIR" >> $GITHUB_ENV + env: + REPO_NAME: ${{ github.event.repository.name }} + TOKEN: ${{ secrets.WORKFLOW }} + TARGET_SHA: ${{ github.sha }} + TARGET_REF: ${{ github.ref }} + TARGET_REF_NAME: ${{ github.ref_name }} + run: bash .gitea/ci/prepare_repo.sh - name: 🧪 Lint commit message / PR title run: | cd "$REPO_DIR" diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 9656eebc..d1c5188f 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -17,10 +17,8 @@ concurrency: # 🔧 配置区域 - 测试参数 # ========================================== env: - # ===== 测试环境配置 ===== # 测试工作目录 WORKSPACE_DIR: "/home/workspace" - TEST_WORKSPACE: "/home/workspace/playbook-test" jobs: # ========================================== @@ -32,52 +30,13 @@ jobs: steps: - name: 📥 准备仓库 - run: | - echo "========================================" - echo "📥 准备仓库到 WORKSPACE_DIR" - echo "========================================" - - REPO_NAME="${{ github.event.repository.name }}" - REPO_DIR="${{ env.WORKSPACE_DIR }}/$REPO_NAME" - TOKEN="${{ secrets.WORKFLOW }}" - if [ -n "$TOKEN" ]; then - REPO_URL="https://oauth2:${TOKEN}@${GITHUB_SERVER_URL#https://}/${{ github.repository }}.git" - else - REPO_URL="${GITHUB_SERVER_URL}/${{ github.repository }}.git" - fi - - if [ -d "$REPO_DIR" ]; then - if [ -d "$REPO_DIR/.git" ]; then - cd "$REPO_DIR" - git clean -fdx - git reset --hard - git fetch --all --tags --force --prune --prune-tags - else - rm -rf "$REPO_DIR" - fi - fi - - if [ ! -d "$REPO_DIR/.git" ]; then - mkdir -p "${{ env.WORKSPACE_DIR }}" - git clone "$REPO_URL" "$REPO_DIR" - cd "$REPO_DIR" - fi - - TARGET_SHA="${{ github.sha }}" - TARGET_REF="${{ github.ref }}" - if git cat-file -e "$TARGET_SHA^{commit}" 2>/dev/null; then - git checkout -f "$TARGET_SHA" - else - if [ -n "$TARGET_REF" ]; then - git fetch origin "$TARGET_REF" - git checkout -f FETCH_HEAD - else - git checkout -f "${{ github.ref_name }}" - fi - fi - - git config --global --add safe.directory "$REPO_DIR" - echo "REPO_DIR=$REPO_DIR" >> $GITHUB_ENV + env: + REPO_NAME: ${{ github.event.repository.name }} + TOKEN: ${{ secrets.WORKFLOW }} + TARGET_SHA: ${{ github.sha }} + TARGET_REF: ${{ github.ref }} + TARGET_REF_NAME: ${{ github.ref_name }} + run: bash .gitea/ci/prepare_repo.sh - name: 🔧 安装测试依赖 run: |