auto sync #3

Author: Soltus

.github/workflows/sync.yml

@@ -0,0 +1,97 @@
+# refusing to allow a GitHub App to create or update workflow .github/workflows/XXXX.yml without workflows permission
+# 遇到这个错误，需要检查三点：
+# 1. 仓库设置 Workflow permissions 允许写权限
+# 2. 使用的 TOKEN 具有 workflows 权限，如果是组织仓库还需要检查 TOKEN 的作用域
+# 3. actions/checkout 也需要使用 workflows 权限的 TOKEN
+# -------------------------------------------------------------------
+# https://github.com/Soltus
+
+name: Test
+
+on:
+  workflow_call:
+    inputs:
+      target_sync_branch:
+        description: "目标（下游）同步分支，默认为 github.ref ，根据实际情况修改"
+        type: string
+        default: ${{ github.ref }}
+      upstream_sync_repo:
+        description: "上游仓库，默认为 github.repository ，根据实际情况修改"
+        type: string
+        default: ${{ github.repository }}
+      upstream_sync_branch:
+        description: "上游同步分支，必须指定"
+        required: true
+        type: string
+      sync_test_mode: # Adds a boolean option that appears during manual workflow run for easy test mode config
+        description: 'Fork Sync Test Mode'
+        type: boolean
+        default: false
+
+jobs:
+  sync_latest_from_upstream:
+    runs-on: ubuntu-latest
+    name: Sync latest commits from upstream repo
+
+    steps:
+      # REQUIRED step
+      # Step 1: run a standard checkout action, provided by github
+      - name: Checkout target repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.TOEKN_FOREVER_FULL_WRITE }} # 使用具有完全写入权限的 TOKEN（必须包含 workflows ）
+          # REQUIRED if your upstream repo is private (see wiki), 启用会造成 check-branch-exists 失败
+          # persist-credentials: false
+
+      - name: Set up Git
+        run: |
+          git config --global user.name 'GitHub Actions'
+          git config --global user.email '[email protected]'
+
+      - name: Check if target_sync_branch exists in the remote
+        id: check-branch-exists
+        run: |
+          # grep -qE 使用了 -E 参数来启用扩展的正则表达式, 并且使用了 $ 符号来确保匹配的字符串以 main 结尾, 达到精准匹配的目的
+          if git ls-remote --heads origin | grep -qE 'refs/heads/${{ inputs.target_sync_branch }}$'; then
+            echo "branch_exists=true" >> $GITHUB_OUTPUT
+            echo "Remote branch ${{ inputs.target_sync_branch }} exists."
+            git checkout ${{ inputs.target_sync_branch }}
+          else
+            echo "branch_exists=false" >> $GITHUB_OUTPUT
+            echo "Remote branch ${{ inputs.target_sync_branch }} does not exist."
+            git remote add upstream https://github.com/${{ inputs.upstream_sync_repo }}.git
+            # 创建一个临时分支来fetch远程分支的内容
+            git fetch upstream ${{ inputs.upstream_sync_branch }}:temp_${{ inputs.upstream_sync_branch }}
+            # 基于临时分支创建新的本地分支
+            git checkout -b ${{ inputs.target_sync_branch }} temp_${{ inputs.upstream_sync_branch }}
+            # 删除临时分支
+            git branch -d temp_${{ inputs.upstream_sync_branch }}
+            # 推送新分支到远程仓库
+            git push origin ${{ inputs.target_sync_branch }}
+          fi
+
+      # REQUIRED step
+      # Step 2: run the sync action
+      - name: Sync upstream changes
+        id: sync
+        if: steps.check-branch-exists.outputs.branch_exists == 'true'
+        uses: aormsby/[email protected]
+        with:
+          target_sync_branch: ${{ inputs.target_sync_branch }}
+          target_repo_token: ${{ secrets.TOEKN_FOREVER_FULL_WRITE }} # 可能涉及 workflows 的修改，需要对应权限
+          upstream_sync_branch: ${{ inputs.upstream_sync_branch }}
+          upstream_sync_repo: ${{ inputs.upstream_sync_repo }}
+          test_mode: ${{ inputs.sync_test_mode }}
+
+      # Step 3: Display a sample message based on the sync output var 'has_new_commits'
+      - name: New commits found
+        if: steps.sync.outputs.has_new_commits == 'true'
+        run: echo "New commits were found to sync."
+
+      - name: No new commits
+        if: steps.sync.outputs.has_new_commits == 'false'
+        run: echo "There were no new commits."
+
+      - name: Show value of 'has_new_commits'
+        run: echo ${{ steps.sync.outputs.has_new_commits }}

.github/workflows/test.yml

@@ -9,8 +9,4 @@ jobs:
     uses: ./.github/workflows/validation-proxy.yml
     secrets: inherit
     with:
-      name: "test"
-  sync:
-    uses: prototype-test/dist-repo-use-branch_test/.github/workflows/test.yml@HEAD
-    secrets: inherit
-    needs: build
+      name: "test"

.github/workflows/validation-proxy.yml

@@ -34,4 +34,11 @@ jobs:
       cd_path: "${{ inputs.name }}/ci"
       cd_branch: "${{ needs.setup.outputs.cd_branch_prefix }}${{ inputs.name }}"
       dist_path: "${{ inputs.name }}/src"
-      dist_branch: "${{ needs.setup.outputs.dist_branch_prefix }}${{ inputs.name }}"
+      dist_branch: "${{ needs.setup.outputs.dist_branch_prefix }}${{ inputs.name }}"
+  sync:
+    uses: ./.github/workflows/sync.yml
+    secrets: inherit
+    needs: [setup, build]
+    with:
+      upstream_sync_branch: "${{ needs.setup.outputs.dist_branch_prefix }}${{ inputs.name }}"
+      upstream_sync_repo: ${{ needs.setup.outputs.repository }}