From 1b809cfc242de970d3044e09ddfc44247a5c413c Mon Sep 17 00:00:00 2001 From: nap0o Date: Tue, 17 Mar 2026 15:18:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=BA=90=E5=BA=93=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?,=E4=BA=A4=E8=BF=98=E4=B8=BB=E5=8A=A8=E6=9D=83=E7=BB=99?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=87=AA=E4=B8=BB=E5=86=B3=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sync.yml | 44 ------------------------ frontend/src/shared/utils/asyncHelper.js | 2 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 .github/workflows/sync.yml diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml deleted file mode 100644 index 4a13111..0000000 --- a/.github/workflows/sync.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Sync upstream - -on: - schedule: - - cron: "0 16 * * *" - workflow_dispatch: - -permissions: - contents: write - -jobs: - sync: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Configure git - run: | - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - - - name: Sync main from upstream (Surgical) - run: | - git remote add upstream https://github.com/nap0o/2fauth-worker.git || true - git fetch upstream - git checkout main - - if ! git merge upstream/main --no-edit --no-commit; then - git checkout --ours .github/workflows - git add .github/workflows - git commit -m "chore: sync upstream (handled conflicts)" - else - if git diff --name-only HEAD | grep -q ".github/workflows"; then - git checkout HEAD -- .github/workflows - fi - git commit -m "chore: sync upstream (code and assets only)" || echo "no changes" - fi - - - name: Push synced main - run: | - git push origin main \ No newline at end of file diff --git a/frontend/src/shared/utils/asyncHelper.js b/frontend/src/shared/utils/asyncHelper.js index 54751b3..d93c6d8 100644 --- a/frontend/src/shared/utils/asyncHelper.js +++ b/frontend/src/shared/utils/asyncHelper.js @@ -1,4 +1,4 @@ -import { defineAsyncComponent, h, ref, onMounted, onUnmounted, defineComponent } from 'vue' +import { defineAsyncComponent, h, onMounted, defineComponent } from 'vue' import { ElEmpty, ElButton } from 'element-plus' import { i18n } from '@/locales'