6

Author: Soltus

.github/workflows/validation-proxy.yml

@@ -34,8 +34,6 @@ jobs:
     with:
       repository: ${{ inputs.upstream_repository }}
       main_branch: ${{ inputs.main_branch }}
-      # cd_path: ${{ inputs.name }}/ci
-      # cd_branch: ${{ inputs.main_branch }}_-_cd_-_${{ inputs.name }}
       dist_path: ${{ inputs.upstream_dist_path }}
       dist_branch: ${{ inputs.main_branch }}_-_dist_-_${{ inputs.name }}
   sync:

.github/workflows/validation.yml

@@ -12,12 +12,6 @@ on:
       main_branch:  # 上游主分支
         required: true
         type: string
-      # cd_path:  # (Github）持续交付路径, 不能以 / 结尾
-      #   required: true
-      #   type: string
-      # cd_branch: # 不能包含 / 等字符
-      #   required: true
-      #   type: string
       dist_path: # 分发路径, 不能以 / 结尾
         required: true
         type: string
@@ -52,17 +46,7 @@ jobs:
             echo "branch_exists=false" >> $GITHUB_OUTPUT
             echo "Remote branch ${{ inputs.dist_branch }} does not exist."
           fi
-      # - name: Check if cd_branch exists in the remote
-      #   id: cd_branch-exists
-      #   run: |
-      #     # grep -qE 使用了 -E 参数来启用扩展的正则表达式, 并且使用了 $ 符号来确保匹配的字符串以 main 结尾, 达到精准匹配的目的
-      #     if git ls-remote --heads origin | grep -qE 'refs/heads/${{ inputs.cd_branch }}$'; then
-      #       echo "branch_exists=true" >> $GITHUB_OUTPUT
-      #       echo "Remote branch ${{ inputs.cd_branch }} exists."
-      #     else
-      #       echo "branch_exists=false" >> $GITHUB_OUTPUT
-      #       echo "Remote branch ${{ inputs.cd_branch }} does not exist."
-      #     fi
+
       - name: Sync dist_path from main_branch to exists dist_branch
         if: steps.dist_branch-exists.outputs.branch_exists == 'true'
         run: |
@@ -84,27 +68,7 @@ jobs:
           git commit -m "🪂 Sync ${{ inputs.dist_path }} from ${{ inputs.main_branch }} to ${{ inputs.dist_branch }}" || echo "No changes to commit"
           # 删除临时分支
           git branch -D temp_${{ inputs.main_branch }}
-      # - name: Sync cd_path from main_branch to exists cd_branch
-      #   if: steps.cd_branch-exists.outputs.branch_exists == 'true'
-      #   run: |
-      #     # 主分支需要重复使用, 因此基于临时分支操作
-      #     git checkout -b temp_${{ inputs.main_branch }} ${{ inputs.main_branch }}
-      #     # 创建临时文件夹，如果它不存在的话
-      #     mkdir -p $HOME/tmp
-      #     # 清空临时文件夹的内容
-      #     find $HOME/tmp/ -mindepth 1 -maxdepth 1 -exec rm -rf {} +
-      #     ls -A $HOME/tmp/
-      #     rsync -a --exclude '.git' ${{ inputs.cd_path }}/ $HOME/tmp/
-      #     ls -A $HOME/tmp/
-      #     git checkout ${{ inputs.cd_branch }}
-      #     # 清空所有文件，除了.git目录
-      #     find . -mindepth 1 -maxdepth 1 ! -name '.git' -exec rm -rf {} +
-      #     rsync -a --exclude '.git' $HOME/tmp/ ./
-      #     find . -path './.git' -prune -o -exec ls -lR {} +
-      #     git add .
-      #     git commit -m "🪂 Sync ${{ inputs.cd_path }} from ${{ inputs.main_branch }} to ${{ inputs.cd_branch }}" || echo "No changes to commit"
-      #     # 删除临时分支
-      #     git branch -D temp_${{ inputs.main_branch }}
+
       - name: Init dist_branch from dist_path at main_branch
         if: steps.dist_branch-exists.outputs.branch_exists == 'false'
         run: |
@@ -124,25 +88,7 @@ jobs:
           git commit -m "🪂 Initial ${{ inputs.dist_path }} from ${{ inputs.main_branch }} to ${{ inputs.dist_branch }}"
           # 删除临时分支
           git branch -D temp_${{ inputs.main_branch }}
-      # - name: Init cd_branch from cd_path at main_branch
-      #   if: steps.cd_branch-exists.outputs.branch_exists == 'false'
-      #   run: |
-      #     # 主分支需要重复使用, 因此基于临时分支操作
-      #     git checkout -b temp_${{ inputs.main_branch }} ${{ inputs.main_branch }}
-      #     # 创建临时文件夹，如果它不存在的话
-      #     mkdir -p $HOME/tmp
-      #     # 清空临时文件夹的内容
-      #     find $HOME/tmp/ -mindepth 1 -maxdepth 1 -exec rm -rf {} +
-      #     rsync -a --exclude '.git' ${{ inputs.cd_path }}/ $HOME/tmp/
-      #     # 清空所有文件，除了.git目录
-      #     find . -mindepth 1 -maxdepth 1 ! -name '.git' -exec rm -rf {} +
-      #     # 创建一个全新的分支, 不基于任何现有的提交
-      #     git checkout --orphan ${{ inputs.cd_branch }}
-      #     rsync -a --exclude '.git' $HOME/tmp/ ./
-      #     git add .
-      #     git commit -m "🪂 Initial ${{ inputs.cd_path }} from ${{ inputs.main_branch }} to ${{ inputs.cd_branch }}"
-      #     # 删除临时分支
-      #     git branch -D temp_${{ inputs.main_branch }}
+
       - run: |
           git checkout ${{ inputs.dist_branch }}
       - name: Push dist_branch
@@ -155,15 +101,3 @@ jobs:
           # force_with_lease: true # 仅在远程分支自上次检出以来没有其他提交的情况下成功
         env:
           github_token: ${{ secrets.TOEKN_FOREVER_FULL_WRITE }} # 使用具有完全写入权限的 TOKEN（必须包含 workflows ）
-      # - run: |
-      #     git checkout ${{ inputs.cd_branch }}
-      # - name: Push cd_branch
-      #   id: push_cd_branch
-      #   uses: ad-m/github-push-action@master
-      #   with:
-      #     repository: ${{ inputs.repository }}
-      #     branch: ${{ inputs.cd_branch }}
-      #     force: true
-      #     # force_with_lease: true # 仅在远程分支自上次检出以来没有其他提交的情况下成功
-      #   env:
-      #     github_token: ${{ secrets.TOEKN_FOREVER_FULL_WRITE }} # 使用具有完全写入权限的 TOKEN（必须包含 workflows ）