diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index d62b605..a10288c 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,4 +1,4 @@ -name: Auto Merge Base to Other Branches +name: Auto Merge aliyun on: push: @@ -10,11 +10,11 @@ jobs: auto-merge: runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v3 - with: - fetch-depth: 0 - token: ${{ secrets.GH_TOKEN_AUTO_MERGE2 }} + # - name: Checkout repository + # uses: actions/checkout@v3 + # with: + # fetch-depth: 0 + # token: ${{ secrets.GH_TOKEN_AUTO_MERGE2 }} - name: Merge main into aliyun run: | diff --git a/.vscode/settings.json b/.vscode/settings.json index 904ffb7..0f7905a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -36,6 +36,7 @@ "manifest.json": "jsonc" // manifest.json 可以写注释 }, "cSpell.words": [ + "aliyun", "Aplipay", "climblee", "commitlint",