From e192426c570ea1a357bb02da87e4fcad66f121fa Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 22:35:59 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=90=AF=E7=94=A8=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5fork?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Sync.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/Sync.yml diff --git a/.github/workflows/Sync.yml b/.github/workflows/Sync.yml new file mode 100644 index 00000000000..3f444600bce --- /dev/null +++ b/.github/workflows/Sync.yml @@ -0,0 +1,16 @@ +name: Sync Fork + +on: + push: # push 时触发, 主要是为了测试配置有没有问题 + schedule: + - cron: '* */24 * * *' # 每3小时触发, 对于一些更新不那么频繁的项目可以设置为每天一次, 低碳一点 +jobs: + repo-sync: + runs-on: ubuntu-latest + steps: + - uses: TG908/fork-sync@v1.6.3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + owner: ngosang # fork 的上游仓库 user + head: master # fork 的上游仓库 branch + base: master # 本地仓库 branch From 61f882313fb2bfb039a722fd25133b3c44a6ad06 Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 22:55:26 +0800 Subject: [PATCH 02/13] Update Sync.yml --- .github/workflows/Sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Sync.yml b/.github/workflows/Sync.yml index 3f444600bce..c2a6440190f 100644 --- a/.github/workflows/Sync.yml +++ b/.github/workflows/Sync.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: TG908/fork-sync@v1.6.3 with: - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.TOKEN }} owner: ngosang # fork 的上游仓库 user head: master # fork 的上游仓库 branch base: master # 本地仓库 branch From 90148aad40b281912970aab1681a7c5b88bf11f5 Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 23:06:36 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Gitee=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/HubMirror.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/workflows/HubMirror.yml diff --git a/.github/workflows/HubMirror.yml b/.github/workflows/HubMirror.yml new file mode 100644 index 00000000000..5ae7f7b3370 --- /dev/null +++ b/.github/workflows/HubMirror.yml @@ -0,0 +1,9 @@ +steps: +- name: Mirror the Github organization repos to Gitee. + uses: knight000/trackerslist@master + with: + src: github/knight000 + dst: gitee/kni_gitee + dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} + dst_token: ${{ secrets.GITEE_TOKEN }} + account_type: user From 668839c8034d50a7976ccc3929fde1c071574180 Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 23:13:09 +0800 Subject: [PATCH 04/13] Update HubMirror.yml --- .github/workflows/HubMirror.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/HubMirror.yml b/.github/workflows/HubMirror.yml index 5ae7f7b3370..628f29d275e 100644 --- a/.github/workflows/HubMirror.yml +++ b/.github/workflows/HubMirror.yml @@ -1,9 +1,18 @@ -steps: -- name: Mirror the Github organization repos to Gitee. - uses: knight000/trackerslist@master - with: - src: github/knight000 - dst: gitee/kni_gitee - dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} - dst_token: ${{ secrets.GITEE_TOKEN }} - account_type: user +name: Hub Mirror + +on: + push: # push 时触发, 主要是为了测试配置有没有问题 + schedule: + - cron: '* */24 * * *' # 每天一次, 低碳一点 +jobs: + hub-mirror-action: + runs-on: ubuntu-latest + steps: + - name: Mirror the Github organization repos to Gitee. + - uses: Yikun/hub-mirror-action@v1.2 + with: + src: github/knight000 + dst: gitee/kni_gitee + dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} + dst_token: ${{ secrets.GITEE_TOKEN }} + account_type: user From 069d0b147ed43148d76802b21e03f68624db1a48 Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 23:26:27 +0800 Subject: [PATCH 05/13] Update HubMirror.yml --- .github/workflows/HubMirror.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/HubMirror.yml b/.github/workflows/HubMirror.yml index 628f29d275e..b3e5467eb5d 100644 --- a/.github/workflows/HubMirror.yml +++ b/.github/workflows/HubMirror.yml @@ -1,5 +1,3 @@ -name: Hub Mirror - on: push: # push 时触发, 主要是为了测试配置有没有问题 schedule: @@ -9,10 +7,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Mirror the Github organization repos to Gitee. - - uses: Yikun/hub-mirror-action@v1.2 + - uses: Yikun/hub-mirror-action@master with: src: github/knight000 dst: gitee/kni_gitee dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} dst_token: ${{ secrets.GITEE_TOKEN }} + mappings: "trackerslist=>trackerslist_mirror" + static_list: "trackerslist" account_type: user From 6411ff235a177d0bd095b88630e1d8164c3b7873 Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 23:28:45 +0800 Subject: [PATCH 06/13] Update Sync.yml --- .github/workflows/Sync.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Sync.yml b/.github/workflows/Sync.yml index c2a6440190f..74fb97d4960 100644 --- a/.github/workflows/Sync.yml +++ b/.github/workflows/Sync.yml @@ -8,9 +8,9 @@ jobs: repo-sync: runs-on: ubuntu-latest steps: - - uses: TG908/fork-sync@v1.6.3 + - uses: TG908/fork-sync@master with: - github_token: ${{ secrets.TOKEN }} + github_token: ${{ secrets.GITHUB_TOKEN }} owner: ngosang # fork 的上游仓库 user head: master # fork 的上游仓库 branch base: master # 本地仓库 branch From b070cb6da752a178698d0f647b2947707b145e9d Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 23:34:11 +0800 Subject: [PATCH 07/13] Create GiteeMirror.yml --- .github/workflows/GiteeMirror.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/GiteeMirror.yml diff --git a/.github/workflows/GiteeMirror.yml b/.github/workflows/GiteeMirror.yml new file mode 100644 index 00000000000..7e901707b28 --- /dev/null +++ b/.github/workflows/GiteeMirror.yml @@ -0,0 +1,19 @@ +name: GiteeMirror +on: + push: # push 时触发, 主要是为了测试配置有没有问题 + schedule: + - cron: '* */24 * * *' # 每天一次, 低碳一点 +jobs: + hub-mirror-action: + runs-on: ubuntu-latest + steps: + - name: Mirror the Github organization repos to Gitee. + - uses: Yikun/hub-mirror-action@master + with: + src: github/knight000 + dst: gitee/kni_gitee + dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} + dst_token: ${{ secrets.GITEE_TOKEN }} + mappings: "trackerslist=>trackerslist_mirror" + static_list: "trackerslist" + account_type: user From 98e88698afa8db2272bc0ab83c7888c2e6983627 Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 23:34:28 +0800 Subject: [PATCH 08/13] Delete HubMirror.yml --- .github/workflows/HubMirror.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/HubMirror.yml diff --git a/.github/workflows/HubMirror.yml b/.github/workflows/HubMirror.yml deleted file mode 100644 index b3e5467eb5d..00000000000 --- a/.github/workflows/HubMirror.yml +++ /dev/null @@ -1,18 +0,0 @@ -on: - push: # push 时触发, 主要是为了测试配置有没有问题 - schedule: - - cron: '* */24 * * *' # 每天一次, 低碳一点 -jobs: - hub-mirror-action: - runs-on: ubuntu-latest - steps: - - name: Mirror the Github organization repos to Gitee. - - uses: Yikun/hub-mirror-action@master - with: - src: github/knight000 - dst: gitee/kni_gitee - dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} - dst_token: ${{ secrets.GITEE_TOKEN }} - mappings: "trackerslist=>trackerslist_mirror" - static_list: "trackerslist" - account_type: user From c7d6e0bd5da6a49be9d6320287f6ebaa1e6410a1 Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 23:39:32 +0800 Subject: [PATCH 09/13] Update GiteeMirror.yml --- .github/workflows/GiteeMirror.yml | 51 +++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/.github/workflows/GiteeMirror.yml b/.github/workflows/GiteeMirror.yml index 7e901707b28..f1203e79cb8 100644 --- a/.github/workflows/GiteeMirror.yml +++ b/.github/workflows/GiteeMirror.yml @@ -1,19 +1,38 @@ -name: GiteeMirror +# 通过 Github actions， 在 Github 仓库的每一次 commit 后自动同步到 Gitee 上 +name: sync2gitee on: - push: # push 时触发, 主要是为了测试配置有没有问题 - schedule: - - cron: '* */24 * * *' # 每天一次, 低碳一点 + push: + branches: + - master jobs: - hub-mirror-action: + repo-sync: + env: + dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} + dst_token: ${{ secrets.GITEE_TOKEN }} + gitee_user: ${{ secrets.GITEE_USER }} runs-on: ubuntu-latest - steps: - - name: Mirror the Github organization repos to Gitee. - - uses: Yikun/hub-mirror-action@master - with: - src: github/knight000 - dst: gitee/kni_gitee - dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} - dst_token: ${{ secrets.GITEE_TOKEN }} - mappings: "trackerslist=>trackerslist_mirror" - static_list: "trackerslist" - account_type: user + steps: + - uses: actions/checkout@v2 + with: + persist-credentials: false + + - name: sync github -> gitee + uses: Yikun/hub-mirror-action@master + if: env.dst_key && env.dst_token && env.gitee_user + with: + # 必选，需要同步的 Github 用户（源） + src: 'github/${{ github.repository_owner }}' + # 必选，需要同步到的 Gitee 用户（目的） + dst: 'gitee/kni_gitee' + # 必选，Gitee公钥对应的私钥，https://gitee.com/profile/sshkeys + dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} + # 必选，Gitee对应的用于创建仓库的token，https://gitee.com/profile/personal_access_tokens + dst_token: ${{ secrets.GITEE_TOKEN }} + # 如果是组织，指定组织即可，默认为用户 user + # account_type: org + # 直接取当前项目的仓库名 + static_list: ${{ github.event.repository.name }} + # 还有黑、白名单，静态名单机制，可以用于更新某些指定库 + # static_list: 'repo_name,repo_name2' + # black_list: 'repo_name,repo_name2' + # white_list: 'repo_name,repo_name2' From 2ba2c60cbf194b5b86804cdfd4fbd6405ca90d38 Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 23:47:22 +0800 Subject: [PATCH 10/13] Update Sync.yml --- .github/workflows/Sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Sync.yml b/.github/workflows/Sync.yml index 74fb97d4960..7fe4e552c99 100644 --- a/.github/workflows/Sync.yml +++ b/.github/workflows/Sync.yml @@ -8,7 +8,7 @@ jobs: repo-sync: runs-on: ubuntu-latest steps: - - uses: TG908/fork-sync@master + - uses: tgymnich/fork-sync@v1.8 with: github_token: ${{ secrets.GITHUB_TOKEN }} owner: ngosang # fork 的上游仓库 user From 5117fb0f3dba33b8fd2d6fb92110d94d28a8467a Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 23:56:53 +0800 Subject: [PATCH 11/13] Update GiteeMirror.yml --- .github/workflows/GiteeMirror.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/GiteeMirror.yml b/.github/workflows/GiteeMirror.yml index f1203e79cb8..0094bb6d4d4 100644 --- a/.github/workflows/GiteeMirror.yml +++ b/.github/workflows/GiteeMirror.yml @@ -23,7 +23,7 @@ jobs: # 必选，需要同步的 Github 用户（源） src: 'github/${{ github.repository_owner }}' # 必选，需要同步到的 Gitee 用户（目的） - dst: 'gitee/kni_gitee' + dst: 'gitee/${{ secrets.GITEE_USER }}' # 必选，Gitee公钥对应的私钥，https://gitee.com/profile/sshkeys dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} # 必选，Gitee对应的用于创建仓库的token，https://gitee.com/profile/personal_access_tokens From 02d810f7ca992d7a701e1547046daf0a3e7314bd Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Tue, 28 Mar 2023 23:57:34 +0800 Subject: [PATCH 12/13] Update Sync.yml --- .github/workflows/Sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Sync.yml b/.github/workflows/Sync.yml index 7fe4e552c99..17c08f4459a 100644 --- a/.github/workflows/Sync.yml +++ b/.github/workflows/Sync.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: tgymnich/fork-sync@v1.8 with: - github_token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} owner: ngosang # fork 的上游仓库 user head: master # fork 的上游仓库 branch base: master # 本地仓库 branch From 0bfd04b2b7ee29449801a1be74730feb8cd69079 Mon Sep 17 00:00:00 2001 From: knight000 <36959630+knight000@users.noreply.github.com> Date: Wed, 29 Mar 2023 00:09:56 +0800 Subject: [PATCH 13/13] Update Sync.yml --- .github/workflows/Sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Sync.yml b/.github/workflows/Sync.yml index 17c08f4459a..9d5edefaaa1 100644 --- a/.github/workflows/Sync.yml +++ b/.github/workflows/Sync.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: tgymnich/fork-sync@v1.8 with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.TOKEN }} owner: ngosang # fork 的上游仓库 user head: master # fork 的上游仓库 branch base: master # 本地仓库 branch