diff --git a/.github/workflows/auto_newversion.yml b/.github/workflows/auto_newversion.yml index 72295b9..862e5e6 100644 --- a/.github/workflows/auto_newversion.yml +++ b/.github/workflows/auto_newversion.yml @@ -4,11 +4,10 @@ on: push: paths: - "**.txt" + - "AutoBuild/pure_domain.py" jobs: - # This workflow contains a single job called "build" build: - # The type of runner that the job will run on runs-on: ubuntu-latest steps: @@ -19,12 +18,19 @@ jobs: with: python-version: "3.x" + - name: Run AutoBuild + run: | + cd ${{ github.workspace }}/AutoBuild + python pure_domain.py + - id: files uses: jitterbit/get-changed-files@v1 with: format: "csv" - - run: | - cd AutoBuild + + - name: Run AutoUpdateVerNum + run: | + cd ${{ github.workspace }}/AutoBuild mapfile -d ',' -t added_modified_files < <(printf '%s,' '${{ steps.files.outputs.added_modified }}') for added_modified_file in "${added_modified_files[@]}"; do python auto_update_version.py ${added_modified_file} @@ -34,7 +40,13 @@ jobs: run: | git config --local user.email "action@github.com" git config --local user.name "GitHub Action" + git add domains.txt + git commit -m "🤖 自動更新 domains.txt" || echo "[INFO] Fail to commit domains.txt, may not need to update the file?" git add *.txt git commit -m "🤖 自動更新 版本號" + - name: Push changes uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: ${{ github.ref }} diff --git a/.github/workflows/pure_domain.yml b/.github/workflows/pure_domain.yml deleted file mode 100644 index 0e6bdda..0000000 --- a/.github/workflows/pure_domain.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: PureDomain - -on: - workflow_dispatch: - push: - paths: - - "hosts.txt" - - "AutoBuild/pure_domain.py" - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Wait for auto new version finished - uses: lewagon/wait-on-check-action@v1.0.0 - with: - ref: ${{ github.ref }} - running-workflow-name: "Auto Update Version" - repo-token: ${{ secrets.GITHUB_TOKEN }} - wait-interval: 10 - allowed-conclusions: success,skipped,cancelled - - - uses: actions/checkout@v2 - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: "3.x" - - - name: Run AutoBuild - run: | - git pull - cd AutoBuild - python pure_domain.py - - - name: Commit files - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - git add domains.txt - git commit -m "🤖 自動更新 domains.txt" - - name: Push changes - uses: ad-m/github-push-action@master diff --git a/hosts.txt b/hosts.txt index 7f0bfc7..714a4fa 100644 --- a/hosts.txt +++ b/hosts.txt @@ -1,7 +1,7 @@ ! FutaHosts ! LowTechFilter Host ! URL: -! Version: 2022.0831.9 +! Version: 2022.0831.10 ! -------------------------------------------------- ! 白清單 @@||ip2location.com^ @@ -209,5 +209,3 @@ /tw\S{2}gov\.com/ /\S{3}gov\.(com|tv|me|top)/ /butie\S+\.(shop|xyz)/ - -! action test flag \ No newline at end of file