diff --git a/.github/workflows/workflow_without_post.yml b/.github/workflows/workflow_without_post.yml index 74cd8a9..ee9abbd 100644 --- a/.github/workflows/workflow_without_post.yml +++ b/.github/workflows/workflow_without_post.yml @@ -1,4 +1,4 @@ -name: Build module (Without telegram post) +name: Build module on: workflow_dispatch: @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@v4 - name: Make build dirs - run: mkdir -p zaprett/system/bin zaprett-extended/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-extended/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists + run: mkdir -p zaprett/system/bin zaprett-hosts/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-hosts/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists - name: Download latest zapret binaries run: | @@ -60,27 +60,25 @@ jobs: cp zapret-latest/binaries/android-x86_64/nfqws zaprett/system/bin/nfqws_x86_64 cp zapret-latest/binaries/linux-mips/nfqws zaprett/system/bin/nfqws_mips cp zapret-latest/binaries/linux-mipsel/nfqws zaprett/system/bin/nfqws_mipsel - #cp src/bin/zaprett zaprett/system/bin/ cp -a src/* zaprett/ #copy all files to another distributions - cp -r zaprett/* zaprett-extended/ + cp -r zaprett/* zaprett-hosts/ cp -r zaprett/* zaprett-tv/ - name: Download and copy actual lists run: | wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-youtube.txt -O lists/list-youtube.txt wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-discord.txt -O lists/list-discord.txt - wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-extended.txt -O lists/list-extended.txt cp lists/list-youtube.txt zaprett/system/etc/zaprett/lists/ - cp lists/list-youtube.txt zaprett-extended/system/etc/zaprett/lists/ + cp lists/list-youtube.txt zaprett-hosts/system/etc/zaprett/lists/ cp lists/list-youtube.txt zaprett-tv/system/etc/zaprett/lists/ cp lists/list-discord.txt zaprett/system/etc/zaprett/lists/ - cp lists/list-discord.txt zaprett-extended/system/etc/zaprett/lists/ + cp lists/list-discord.txt zaprett-hosts/system/etc/zaprett/lists/ - cp lists/list-extended.txt zaprett-extended/system/etc/zaprett/lists/ + cp hosts/hosts zaprett-hosts/system/etc - name: Create module.prop run: | @@ -94,9 +92,9 @@ jobs: updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update.json EOF - cat > zaprett-extended/module.prop < zaprett-hosts/module.prop < update_extended.json < update_hosts.json <