mirror of
https://github.com/privacy-protection-tools/anti-AD.git
synced 2025-02-12 00:22:55 +08:00
Compare commits
No commits in common. "9d7a9281a8ebd6a3f9280ff4e7b36d88993a7bed" and "ce4dff9492d2fbc6b04e587884ee8b6f081d6b01" have entirely different histories.
9d7a9281a8
...
ce4dff9492
148
.github/workflows/full-update.yml
vendored
148
.github/workflows/full-update.yml
vendored
@ -1,148 +0,0 @@
|
||||
name: Full update
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '30 18 */3 * *'
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
full-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Get source code from master
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: master
|
||||
path: master
|
||||
|
||||
- name: Get source code from adlist-maker
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: adlist-maker
|
||||
path: adlist-maker
|
||||
|
||||
- name: Get latest upstream lists
|
||||
working-directory: adlist-maker
|
||||
run: |
|
||||
/bin/bash ./scripts/prepare-upstream.sh
|
||||
|
||||
- name: Commit upstream changes
|
||||
working-directory: adlist-maker
|
||||
run: |
|
||||
git config user.email "action@github.com"
|
||||
git config user.name "GitHub Action[bot]"
|
||||
git add .
|
||||
git commit -m "Update upstream lists"
|
||||
git push
|
||||
|
||||
- name: Build anti-AD lists
|
||||
working-directory: adlist-maker
|
||||
run: |
|
||||
/bin/bash ./scripts/build-list.sh
|
||||
|
||||
- name: Commit anti-AD changes
|
||||
run: |
|
||||
mv -f ./adlist-maker/adblock-for-dnsmasq.conf ./master/
|
||||
mv -f ./adlist-maker/anti-ad-* ./master/
|
||||
cd ./master
|
||||
git config user.email "action@github.com"
|
||||
git config user.name "GitHub Action[bot]"
|
||||
git add .
|
||||
git commit -m "Auto renew anti-AD lists" -m "with upstream changes"
|
||||
git push
|
||||
|
||||
sync:
|
||||
if: github.repository == 'privacy-protection-tools/anti-AD'
|
||||
needs: full-build
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Get source code from master
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: master
|
||||
path: master
|
||||
|
||||
- name: Get source code from website
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
token: ${{ secrets.PERSON_TOKEN }}
|
||||
repository: privacy-protection-tools/anti-ad.github.io
|
||||
ref: master
|
||||
path: website
|
||||
|
||||
- name: Install sing-box
|
||||
env:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
sudo curl -fsSL https://sing-box.app/gpg.key -o /etc/apt/keyrings/sagernet.asc
|
||||
sudo chmod a+r /etc/apt/keyrings/sagernet.asc
|
||||
echo "deb [arch=`dpkg --print-architecture` signed-by=/etc/apt/keyrings/sagernet.asc] https://deb.sagernet.org/ * *" | sudo tee /etc/apt/sources.list.d/sagernet.list > /dev/null
|
||||
sudo apt-get update
|
||||
sudo apt-get install sing-box
|
||||
|
||||
- name: Install mihomo
|
||||
env:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
case "$(uname -m)" in
|
||||
'x86_64') ARCH='amd64' ;;
|
||||
'x86' | 'i686' | 'i386') ARCH='386' ;;
|
||||
'aarch64' | 'arm64') ARCH='arm64' ;;
|
||||
'armv7l') ARCH='armv7' ;;
|
||||
'riscv64') ARCH='riscv64' ;;
|
||||
's390x') ARCH='s390x' ;;
|
||||
*) ARCH='unknown' ;;
|
||||
esac
|
||||
echo "The architecture is: $ARCH"
|
||||
[ "$ARCH" = 'unknown' ] || {
|
||||
MIHOMO_VER=$(wget -q -O - 'https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/version.txt')
|
||||
# e.g. alpha-3e966e8
|
||||
URL='https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/mihomo-linux-'$ARCH'-'$MIHOMO_VER'.deb'
|
||||
# e.g. https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/mihomo-linux-amd64-alpha-3e966e8.deb
|
||||
wget -q -O ./mihomo.deb "$URL"
|
||||
sudo apt-get install ./mihomo.deb
|
||||
rm -f ./mihomo.deb
|
||||
}
|
||||
|
||||
- name: Compile binary for sing-box/mihomo
|
||||
working-directory: master
|
||||
run: |
|
||||
if [ "$(which sing-box 2>/dev/null)"x = 'x' ]; then
|
||||
echo 'sing-box not available.'
|
||||
else
|
||||
echo 'Compiling sing-box rule-set...'
|
||||
sing-box rule-set convert --type adguard ./anti-ad-adguard.txt --output ./anti-ad-sing-box.srs
|
||||
sha256sum ./anti-ad-sing-box.srs
|
||||
fi
|
||||
if [ "$(which mihomo 2>/dev/null)"x = 'x' ]; then
|
||||
echo 'mihomo not available.'
|
||||
else
|
||||
echo 'Compiling mihomo ruleset...'
|
||||
mihomo convert-ruleset domain yaml ./anti-ad-clash.yaml ./anti-ad-mihomo.mrs
|
||||
sha256sum ./anti-ad-mihomo.mrs
|
||||
fi
|
||||
|
||||
- name: Update website files
|
||||
run: |
|
||||
cp -f ./master/anti-ad-easylist.txt ./website/docs/easylist.txt
|
||||
cp -f ./master/anti-ad-easylist.txt.md5 ./website/docs/easylist.txt.md5
|
||||
cp -f ./master/anti-ad-adguard.txt ./website/docs/adguard.txt
|
||||
cp -f ./master/anti-ad-adguard.txt.md5 ./website/docs/adguard.txt.md5
|
||||
cp -f ./master/adblock-for-dnsmasq.conf ./website/docs/dnsmasq.conf
|
||||
cp -f ./master/adblock-for-dnsmasq.conf ./website/docs/anti-ad-for-dnsmasq.conf
|
||||
cp -f ./master/anti-ad-smartdns.conf ./website/docs/anti-ad-for-smartdns.conf
|
||||
cp -f ./master/anti-ad-surge.txt ./website/docs/surge.txt
|
||||
cp -f ./master/anti-ad-surge2.txt ./website/docs/surge2.txt
|
||||
cp -f ./master/anti-ad-clash.yaml ./website/docs/clash.yaml
|
||||
cp -f ./master/anti-ad-domains.txt ./website/docs/domains.txt
|
||||
[ -s './master/anti-ad-sing-box.srs' ] && cp -f ./master/anti-ad-sing-box.srs ./website/docs/anti-ad-sing-box.srs
|
||||
[ -s './master/anti-ad-mihomo.mrs' ] && cp -f ./master/anti-ad-mihomo.mrs ./website/docs/mihomo.mrs
|
||||
|
||||
- name: Commit to website
|
||||
working-directory: website
|
||||
run: |
|
||||
git config user.email "action@github.com"
|
||||
git config user.name "GitHub Action[bot]"
|
||||
git add .
|
||||
git commit -m "Sync latest lists"
|
||||
git push
|
||||
17
.github/workflows/schedule-trigger.yml
vendored
Normal file
17
.github/workflows/schedule-trigger.yml
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
name: schedule trigger
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '30 18 */3 * *'
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Run a multi-line script
|
||||
run: |
|
||||
curl -s -m 30 -X POST "$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/actions/workflows/download-upstream.yml/dispatches" -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.PERSON_TOKEN }}" -d '{"ref":"adlist-maker"}'
|
||||
|
||||
|
||||
94
.github/workflows/sync-to-dist.yml
vendored
Normal file
94
.github/workflows/sync-to-dist.yml
vendored
Normal file
@ -0,0 +1,94 @@
|
||||
name: sync list to dist
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'master'
|
||||
paths:
|
||||
- 'anti-ad-**.*'
|
||||
- 'adblock-for-dnsmasq.conf'
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4.1.1
|
||||
- name: clone the website
|
||||
run: git clone https://github.com/privacy-protection-tools/anti-ad.github.io.git ~/website
|
||||
|
||||
- name: Install sing-box
|
||||
env:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
sudo curl -fsSL https://sing-box.app/gpg.key -o /etc/apt/keyrings/sagernet.asc
|
||||
sudo chmod a+r /etc/apt/keyrings/sagernet.asc
|
||||
echo "deb [arch=`dpkg --print-architecture` signed-by=/etc/apt/keyrings/sagernet.asc] https://deb.sagernet.org/ * *" | sudo tee /etc/apt/sources.list.d/sagernet.list > /dev/null
|
||||
sudo apt-get update
|
||||
sudo apt-get install sing-box
|
||||
|
||||
- name: Install mihomo
|
||||
env:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
case "$(uname -m)" in
|
||||
'x86_64') ARCH='amd64' ;;
|
||||
'x86' | 'i686' | 'i386') ARCH='386' ;;
|
||||
'aarch64' | 'arm64') ARCH='arm64' ;;
|
||||
'armv7l') ARCH='armv7' ;;
|
||||
'riscv64') ARCH='riscv64' ;;
|
||||
's390x') ARCH='s390x' ;;
|
||||
*) ARCH='unknown' ;;
|
||||
esac
|
||||
echo "The architecture is: $ARCH"
|
||||
[ "$ARCH" = 'unknown' ] || {
|
||||
MIHOMO_VER=$(wget -q -O - 'https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/version.txt')
|
||||
# e.g. alpha-3e966e8
|
||||
URL='https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/mihomo-linux-'$ARCH'-'$MIHOMO_VER'.deb'
|
||||
# e.g. https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/mihomo-linux-amd64-alpha-3e966e8.deb
|
||||
wget -q -O ./mihomo.deb "$URL"
|
||||
sudo apt-get install ./mihomo.deb
|
||||
rm -f ./mihomo.deb
|
||||
}
|
||||
|
||||
- name: Compile binaries for sing-box/mihomo
|
||||
run: |
|
||||
echo 'Compiling sing-box rule-set...'
|
||||
sing-box rule-set convert --type adguard ./anti-ad-adguard.txt --output ./anti-ad-sing-box.srs
|
||||
sha256sum ./anti-ad-sing-box.srs
|
||||
echo 'Compiling mihomo ruleset...'
|
||||
mihomo convert-ruleset domain yaml ./anti-ad-clash.yaml ./anti-ad-mihomo.mrs
|
||||
sha256sum ./anti-ad-mihomo.mrs
|
||||
|
||||
- name: Copy some list files
|
||||
run: |
|
||||
cp ./anti-ad-easylist.txt ~/website/docs/easylist.txt
|
||||
cp ./anti-ad-easylist.txt.md5 ~/website/docs/easylist.txt.md5
|
||||
cp ./anti-ad-adguard.txt ~/website/docs/adguard.txt
|
||||
cp ./anti-ad-adguard.txt.md5 ~/website/docs/adguard.txt.md5
|
||||
cp ./adblock-for-dnsmasq.conf ~/website/docs/dnsmasq.conf
|
||||
cp ./adblock-for-dnsmasq.conf ~/website/docs/anti-ad-for-dnsmasq.conf
|
||||
cp ./anti-ad-smartdns.conf ~/website/docs/anti-ad-for-smartdns.conf
|
||||
cp ./anti-ad-surge.txt ~/website/docs/surge.txt
|
||||
cp ./anti-ad-surge2.txt ~/website/docs/surge2.txt
|
||||
cp ./anti-ad-clash.yaml ~/website/docs/clash.yaml
|
||||
cp ./anti-ad-mihomo.mrs ~/website/docs/mihomo.mrs
|
||||
cp ./anti-ad-domains.txt ~/website/docs/domains.txt
|
||||
cp ./anti-ad-sing-box.srs ~/website/docs/anti-ad-sing-box.srs
|
||||
|
||||
- name: Commit files
|
||||
run: |
|
||||
cd ~/website
|
||||
git config --local user.email "action@github.com"
|
||||
git config --local user.name "GitHub Action"
|
||||
git add .
|
||||
git commit -m "pull newest list." -a
|
||||
|
||||
- name: Push changes
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
github_token: ${{ secrets.PERSON_TOKEN }}
|
||||
branch: 'master'
|
||||
directory: '/home/runner/website'
|
||||
repository: 'privacy-protection-tools/anti-ad.github.io'
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1 +1 @@
|
||||
e9edd1fa880a706069440fbc3ce05494
|
||||
3508d734424db440c92f0d1e082a87e0
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1 +1 @@
|
||||
0408122e5bec3891627636440dbf8b5c
|
||||
3e56ce84933a77229a6ddc453400504e
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user