From 187ca081fefa3d96edfdd3ba319f9279d166c0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Thu, 15 Jan 2026 05:36:51 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 改为由 Build 调用 2. 修改提交用户为 gh action 机器人 --- .github/workflows/sync_with_upstream.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync_with_upstream.yml b/.github/workflows/sync_with_upstream.yml index 9e569a9c074..43a7d3f8a00 100644 --- a/.github/workflows/sync_with_upstream.yml +++ b/.github/workflows/sync_with_upstream.yml @@ -1,9 +1,13 @@ name: Sync with Upstream on: - schedule: - - cron: '0 0 * * *' + # schedule: + # - cron: '0 0 * * *' workflow_dispatch: + workflow_call: # 2026.1.15: 被 build.yml 调用后执行 + +permissions: + contents: write # 2026.1.15: 允许写入 jobs: sync: @@ -17,8 +21,12 @@ jobs: - name: Configure Git run: | - git config user.name 'Shanwer' - git config user.email 'Shanwer@qq.com' + # git config user.name 'Shanwer' + # git config user.email 'Shanwer@qq.com' + + # 2026.1.15: 提交用户改为 github-actions[bot] + git config user.name 'github-actions[bot]' + git config user.email 'github-actions[bot]@users.noreply.github.com' - name: Add upstream remote run: git remote add upstream https://github.com/GeyserMC/Geyser.git From 4cae878d48085fefc58220b014cb7e44381b7377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Thu, 15 Jan 2026 06:01:18 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=BF=90=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59aa890869e..7d4e7832bd1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,8 @@ name: Build on: + schedule: + - cron: '15 12 * * *' # 2026.1.15: 12点15分自动运行，比同步上游迟了十五分钟 workflow_dispatch: push: branches-ignore: From 9feb6d0ab802acf86656f18d53a2612a7a0cc743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Thu, 15 Jan 2026 06:02:21 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA=E6=AD=A3=E5=8D=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated the schedule to run daily at noon. --- .github/workflows/sync_with_upstream.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sync_with_upstream.yml b/.github/workflows/sync_with_upstream.yml index 43a7d3f8a00..af39273267b 100644 --- a/.github/workflows/sync_with_upstream.yml +++ b/.github/workflows/sync_with_upstream.yml @@ -1,10 +1,9 @@ name: Sync with Upstream on: - # schedule: - # - cron: '0 0 * * *' + schedule: + - cron: '0 12 * * *' # 2025.1.15: 增加12点自动运行 workflow_dispatch: - workflow_call: # 2026.1.15: 被 build.yml 调用后执行 permissions: contents: write # 2026.1.15: 允许写入 From c5aba53fd60e8514c5714bbe81434083052fdc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Thu, 15 Jan 2026 06:19:32 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8A=E6=B8=B8=E6=88=90=E5=8A=9F=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d4e7832bd1..9f33bd68f4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,10 @@ name: Build on: - schedule: - - cron: '15 12 * * *' # 2026.1.15: 12点15分自动运行，比同步上游迟了十五分钟 + workflow_run: + workflows: ["Sync with Upstream"] # 2026.1.15: 监听同步上游完成后运行 + types: + - completed workflow_dispatch: push: branches-ignore: @@ -22,6 +24,7 @@ on: jobs: build: runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'success' }} # 2026.1.15: 上游完成且成功才运行 steps: - name: Get Release Info id: release-info From 29c27027f4c815aeea4e9372c4d0b3fabc0c62a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Thu, 15 Jan 2026 06:44:36 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7cedf3d908e..7b753b1e047 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ -### 下载须知: -这是Geyser的非官方版本，旨在恢复了不安全的mojang账号登录功能以提供Authlib-injector支持，该Repo使用GitHub Action与Upstream每日定时同步以保证源代码最新，但由于Action的限制，不能做到同步代码后自动构建，需要更新可以自行clone编译或者踢我一下来开一个Action的手动构建。我自己也是服主，所以一般基岩协议版本更新的时候我都会在那构建一下。 +### 关于本仓库: +这是 Geyser 的非官方版本。本版本恢复了被 Geyser 官方移除的 Mojang 账号登录功能。Mojang 账号登录功能是提供 Authlib-injector 功能所必须的。本仓库使用 GitHub Action 进行自动同步、合并上游，并自动构建。构建于每日正午（12点）生成在 [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) Action 中。本仓库的 Mojang 账户登陆功能恢复 fork 自仓库 [Shanwer/Geyser](https://github.com/Shanwer/Geyser)，特别感谢 Shanwer 大佬。 -This is the unofficial version of Geyser. It aims to revert the insecure function of mojang account login which gives you access to inject authlib. This repo uses GitHub Action to keep up-todate with the upstream everyday, however, due to the action's limit, it cannot automatically build after syncing the source code. If you need update, you can clone it and build by yourself or inform me to launch a workflow dispatch. Me myself am a server owner and whenever the bedrock protocol updates I will build it on action. +#### About this repository +This is an unofficial version of Geyser. It restores the Mojang account login feature removed by the official repository, which is required for Authlib-injector support. This repository uses GitHub Actions to automatically sync, merge, and build from upstream daily at 12:00 PM. You can find the latest builds in the [Build](https://github.com/Shanwer/Geyser/actions/workflows/build.yml) workflow. The patch for restoring Mojang login is forked from [Shanwer/Geyser](https://github.com/Shanwer/Geyser). Special thanks to Shanwer. Geyser From 09023466a605f52a4a94cd46826517c66ade3405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Thu, 15 Jan 2026 06:47:26 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E5=88=AB?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b753b1e047..3b7fae6bc11 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ### 关于本仓库: -这是 Geyser 的非官方版本。本版本恢复了被 Geyser 官方移除的 Mojang 账号登录功能。Mojang 账号登录功能是提供 Authlib-injector 功能所必须的。本仓库使用 GitHub Action 进行自动同步、合并上游，并自动构建。构建于每日正午（12点）生成在 [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) Action 中。本仓库的 Mojang 账户登陆功能恢复 fork 自仓库 [Shanwer/Geyser](https://github.com/Shanwer/Geyser)，特别感谢 Shanwer 大佬。 +这是 Geyser 的非官方版本。本版本恢复了被 Geyser 官方移除的 Mojang 账号登录功能。Mojang 账号登录功能是提供 Authlib-injector 功能所必须的。本仓库使用 GitHub Action 进行自动同步、合并上游，并自动构建。构建于每日正午（12点）生成在 [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) Action 中。本仓库的 Mojang 账户登录功能恢复 fork 自仓库 [Shanwer/Geyser](https://github.com/Shanwer/Geyser)，特别感谢 Shanwer 大佬。 #### About this repository This is an unofficial version of Geyser. It restores the Mojang account login feature removed by the official repository, which is required for Authlib-injector support. This repository uses GitHub Actions to automatically sync, merge, and build from upstream daily at 12:00 PM. You can find the latest builds in the [Build](https://github.com/Shanwer/Geyser/actions/workflows/build.yml) workflow. The patch for restoring Mojang login is forked from [Shanwer/Geyser](https://github.com/Shanwer/Geyser). Special thanks to Shanwer. From 00d0a65ed0d01cffb5adabf9cef11894aef207ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Thu, 15 Jan 2026 06:54:31 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3b7fae6bc11..8cf360a8cf2 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ ### 关于本仓库: -这是 Geyser 的非官方版本。本版本恢复了被 Geyser 官方移除的 Mojang 账号登录功能。Mojang 账号登录功能是提供 Authlib-injector 功能所必须的。本仓库使用 GitHub Action 进行自动同步、合并上游，并自动构建。构建于每日正午（12点）生成在 [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) Action 中。本仓库的 Mojang 账户登录功能恢复 fork 自仓库 [Shanwer/Geyser](https://github.com/Shanwer/Geyser)，特别感谢 Shanwer 大佬。 +这是 Geyser 的非官方版本。本版本恢复了被 Geyser 官方移除的 Mojang 账号登录功能。Mojang 账号登录功能是提供 Authlib-injector 功能所必须的。本仓库使用 GitHub Action 进行自动同步、合并上游，并自动构建。构建于每日正午（12点）生成在 [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) Workflow 中。本仓库的 Mojang 账户登录功能恢复 fork 自仓库 [Shanwer/Geyser](https://github.com/Shanwer/Geyser)，特别感谢 Shanwer 大佬。 #### About this repository -This is an unofficial version of Geyser. It restores the Mojang account login feature removed by the official repository, which is required for Authlib-injector support. This repository uses GitHub Actions to automatically sync, merge, and build from upstream daily at 12:00 PM. You can find the latest builds in the [Build](https://github.com/Shanwer/Geyser/actions/workflows/build.yml) workflow. The patch for restoring Mojang login is forked from [Shanwer/Geyser](https://github.com/Shanwer/Geyser). Special thanks to Shanwer. +This is an unofficial version of Geyser. It restores the Mojang account login feature removed by the official repository, which is required for Authlib-injector support. This repository uses GitHub Actions to automatically sync, merge, and build from upstream daily at 12:00 PM. You can find the latest builds in the [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) workflow. The patch for restoring Mojang login is forked from [Shanwer/Geyser](https://github.com/Shanwer/Geyser). Special thanks to Shanwer. Geyser From fa84b6be25c00a76468fead67cfeb781c7dd6f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Thu, 15 Jan 2026 06:57:10 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E9=97=B4=E4=B8=BA=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E6=97=B6=E9=97=B412=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sync_with_upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_with_upstream.yml b/.github/workflows/sync_with_upstream.yml index af39273267b..9a8d44def3d 100644 --- a/.github/workflows/sync_with_upstream.yml +++ b/.github/workflows/sync_with_upstream.yml @@ -2,7 +2,7 @@ name: Sync with Upstream on: schedule: - - cron: '0 12 * * *' # 2025.1.15: 增加12点自动运行 + - cron: '0 4 * * *' # 2025.1.15: 北京时间12点自动运行 workflow_dispatch: permissions: From 2f6facb2df66600eaa044bcc4504777e636e6ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Sat, 17 Jan 2026 13:38:23 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9Readme=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8cf360a8cf2..0e2dd0cb0df 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -### 关于本仓库: +### 关于本仓库 这是 Geyser 的非官方版本。本版本恢复了被 Geyser 官方移除的 Mojang 账号登录功能。Mojang 账号登录功能是提供 Authlib-injector 功能所必须的。本仓库使用 GitHub Action 进行自动同步、合并上游，并自动构建。构建于每日正午（12点）生成在 [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) Workflow 中。本仓库的 Mojang 账户登录功能恢复 fork 自仓库 [Shanwer/Geyser](https://github.com/Shanwer/Geyser)，特别感谢 Shanwer 大佬。 #### About this repository From 14e09345a3f051bd6e1749c1f6672c502da3321c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Sat, 17 Jan 2026 13:56:18 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0e2dd0cb0df..6be2e4556b3 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ ### 关于本仓库 -这是 Geyser 的非官方版本。本版本恢复了被 Geyser 官方移除的 Mojang 账号登录功能。Mojang 账号登录功能是提供 Authlib-injector 功能所必须的。本仓库使用 GitHub Action 进行自动同步、合并上游，并自动构建。构建于每日正午（12点）生成在 [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) Workflow 中。本仓库的 Mojang 账户登录功能恢复 fork 自仓库 [Shanwer/Geyser](https://github.com/Shanwer/Geyser)，特别感谢 Shanwer 大佬。 +这是 Geyser 的非官方版本。本版本恢复了被 Geyser 官方移除的 Mojang 账号登录功能。Mojang 账号登录功能是提供 Authlib-injector 功能所必须的。本仓库使用 GitHub Action 进行自动同步、合并上游，以保证源代码跟进上游代码，并自动构建。构建于每日正午（12点）生成在 [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) Workflow 中。 #### About this repository -This is an unofficial version of Geyser. It restores the Mojang account login feature removed by the official repository, which is required for Authlib-injector support. This repository uses GitHub Actions to automatically sync, merge, and build from upstream daily at 12:00 PM. You can find the latest builds in the [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) workflow. The patch for restoring Mojang login is forked from [Shanwer/Geyser](https://github.com/Shanwer/Geyser). Special thanks to Shanwer. +This is an unofficial version of Geyser. It restores the Mojang account login feature removed by the official repository, which is essential for Authlib-injector support. This repository uses GitHub Actions to automatically sync and merge with the upstream daily, ensuring the source code stays up-to-date. Automated builds are generated every day at 12:00 PM in the [Build](https://github.com/NiuexDev/tbc-Geyser-with-mojang-login-build/actions/workflows/build.yml) workflow. Geyser From 901305f51be25b87e33a0750765e85d5c18b467a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Sat, 17 Jan 2026 13:57:09 +0800 Subject: [PATCH 11/15] Update sync_with_upstream.yml workflow comments Removed outdated comments and kept the cron schedule unchanged. --- .github/workflows/sync_with_upstream.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/sync_with_upstream.yml b/.github/workflows/sync_with_upstream.yml index 9a8d44def3d..f34f9878ace 100644 --- a/.github/workflows/sync_with_upstream.yml +++ b/.github/workflows/sync_with_upstream.yml @@ -2,7 +2,7 @@ name: Sync with Upstream on: schedule: - - cron: '0 4 * * *' # 2025.1.15: 北京时间12点自动运行 + - cron: '0 4 * * *' workflow_dispatch: permissions: @@ -20,10 +20,6 @@ jobs: - name: Configure Git run: | - # git config user.name 'Shanwer' - # git config user.email 'Shanwer@qq.com' - - # 2026.1.15: 提交用户改为 github-actions[bot] git config user.name 'github-actions[bot]' git config user.email 'github-actions[bot]@users.noreply.github.com' From cfd2ce98570d1fde8b7d98c7372dbb8996d22428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Sat, 17 Jan 2026 13:57:42 +0800 Subject: [PATCH 12/15] Refactor workflow_run types syntax in build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f33bd68f4c..8eb87f1a4f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,8 +3,7 @@ name: Build on: workflow_run: workflows: ["Sync with Upstream"] # 2026.1.15: 监听同步上游完成后运行 - types: - - completed + types: ["completed"] workflow_dispatch: push: branches-ignore: From 002682752efea6d1fb75c1d12f7eba9bca047698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Sat, 17 Jan 2026 14:01:31 +0800 Subject: [PATCH 13/15] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8eb87f1a4f7..6261f489c46 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build on: workflow_run: - workflows: ["Sync with Upstream"] # 2026.1.15: 监听同步上游完成后运行 + workflows: ["Sync with Upstream"] # 监听同步上游完成后运行 types: ["completed"] workflow_dispatch: push: @@ -23,7 +23,7 @@ on: jobs: build: runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} # 2026.1.15: 上游完成且成功才运行 + if: ${{ github.event.workflow_run.conclusion == 'success' }} # 上游完成且成功才运行 steps: - name: Get Release Info id: release-info From 451b9e191f12118312cd489336f88ddfcc38b48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E8=8E=B1Ceale?= <93030615+Ceale@users.noreply.github.com> Date: Sat, 17 Jan 2026 14:02:00 +0800 Subject: [PATCH 14/15] Update sync_with_upstream.yml --- .github/workflows/sync_with_upstream.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync_with_upstream.yml b/.github/workflows/sync_with_upstream.yml index f34f9878ace..f86fbdc55a6 100644 --- a/.github/workflows/sync_with_upstream.yml +++ b/.github/workflows/sync_with_upstream.yml @@ -2,11 +2,11 @@ name: Sync with Upstream on: schedule: - - cron: '0 4 * * *' + - cron: '0 0 * * *' workflow_dispatch: permissions: - contents: write # 2026.1.15: 允许写入 + contents: write # 允许写入 jobs: sync: From 380d62b26a6b0ab51ef63f4b1523552bcda54242 Mon Sep 17 00:00:00 2001 From: Ceale Date: Mon, 19 Jan 2026 11:19:11 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=AF=B9?= =?UTF-8?q?=E6=AF=94hash=EF=BC=8C=E6=9D=A5=E4=BF=9D=E8=AF=81=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E5=9C=A8=E6=9C=89commit=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E5=8E=BB=E8=A7=A6=E5=8F=91build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sync_with_upstream.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/sync_with_upstream.yml b/.github/workflows/sync_with_upstream.yml index f86fbdc55a6..9ff42ff4519 100644 --- a/.github/workflows/sync_with_upstream.yml +++ b/.github/workflows/sync_with_upstream.yml @@ -29,6 +29,15 @@ jobs: - name: Fetch upstream changes run: git fetch upstream + - name: Check for updates + run: | + UPSTREAM_SHA=$(git rev-parse upstream/master) + LOCAL_SHA=$(git rev-parse HEAD) + if [ "$LOCAL_SHA" == "$UPSTREAM_SHA" ]; then + echo "No changes detected." + exit 1 + fi + - name: Merge upstream changes run: | git merge upstream/master || {