diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 5ef961f..dfd001d 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -13,8 +13,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - env: - GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }} with: fetch-depth: 0 @@ -25,8 +23,6 @@ jobs: - name: Generate Release Name id: commit_count - env: - GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }} run: | today=$(date +%Y%m%d) commit_count=$(TZ=Asia/Shanghai git log --date=local --since="$today 00:00:00" --until="$today 23:59:59" --pretty=format: --name-only | grep -c '^gfw.pac$') @@ -36,8 +32,6 @@ jobs: - name: Create Tag id: create_tag - env: - GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }} run: | git tag "${{ env.RELEASE_NAME }}" git push origin ${{ env.RELEASE_NAME }} @@ -45,8 +39,6 @@ jobs: - name: Create Release id: create_release uses: softprops/action-gh-release@v2 - env: - GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }} with: tag_name: "${{ env.RELEASE_NAME }}" name: "${{ env.RELEASE_NAME }}" diff --git a/.github/workflows/auto-update-gfw-pac.yml b/.github/workflows/auto-update-gfw-pac.yml index 2c54d4f..574abff 100644 --- a/.github/workflows/auto-update-gfw-pac.yml +++ b/.github/workflows/auto-update-gfw-pac.yml @@ -10,8 +10,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - env: - GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }} uses: actions/checkout@v4 - name: Download cn.txt @@ -20,19 +18,15 @@ jobs: - name: Run gfw-pac.py script run: ./gfw-pac.py -f gfw.pac -p "PROXY 127.0.0.1:3128" --proxy-domains=proxy-domains.txt --direct-domains=direct-domains.txt --localtld-domains=local-tlds.txt --ip-file=cidrs-cn.txt - - name: Commit changes - env: - GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }} + - name: Commit and push changes run: | git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - git add . + git add -A git commit -a -m "自动更新 cidrs-cn.txt 和 gfw.pac" + git push - - name: Push changes - uses: ad-m/github-push-action@master - env: - GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }} + - name: Trigger Auto-Release + uses: benc-uk/workflow-dispatch@v1 with: - github_token: ${{ secrets.PERSONAL_TOKEN }} - branch: master + workflow: Auto Generate Release diff --git a/direct-domains.txt b/direct-domains.txt index 030ceed..66a6280 100644 --- a/direct-domains.txt +++ b/direct-domains.txt @@ -109,7 +109,6 @@ idv.cdn-apple.com adcdownload.apple.com alpdownloadit.cdn-apple.com bricks.cdn-apple.com -blob.core.windows.net self.events.data.microsoft.com mobile.events.data.microsoft.com browser.events.data.microsoft.com