diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b933cbd..4b7365e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,10 +33,14 @@ jobs: id: check-rex if: steps.check-gh.outputs.internet_error == '0' run: bash src/etc/ci.sh YT-Advanced/ReX-patches latest youtube-ReX.apk - - name: Check new patch ReX forked by anddea - id: check-rex-anddea + - name: Check new patch ReX forked by anddea stable + id: check-rex-anddea-stable if: steps.check-gh.outputs.internet_error == '0' - run: bash src/etc/ci.sh anddea/revanced-patches latest youtube-ReX-anddea.apk + run: bash src/etc/ci.sh anddea/revanced-patches latest youtube-stable-ReX-anddea.apk + - name: Check new patch ReX forked by anddea beta + id: check-rex-anddea-beta + if: steps.check-gh.outputs.internet_error == '0' + run: bash src/etc/ci.sh anddea/revanced-patches latest youtube-beta-ReX-anddea.apk - name: Check new patch Revanced Extended id: check-rve if: steps.check-gh.outputs.internet_error == '0' @@ -44,11 +48,11 @@ jobs: - name: Check new patch Twitter Piko Stable id: check-twitter-piko-stable if: steps.check-gh.outputs.internet_error == '0' - run: bash src/etc/ci.sh crimera/piko latest twitter-piko-stable.apk + run: bash src/etc/ci.sh crimera/piko latest twitter-stable-piko.apk - name: Check new patch Twitter Piko Beta id: check-twitter-piko-beta if: steps.check-gh.outputs.internet_error == '0' - run: bash src/etc/ci.sh crimera/piko prerelease twitter-piko-beta.apk + run: bash src/etc/ci.sh crimera/piko prerelease twitter-beta-piko.apk - name: Check new patch Revanced For Android 6 & 7 id: check-rve67 if: steps.check-gh.outputs.internet_error == '0' @@ -87,7 +91,8 @@ jobs: check_rv: ${{ steps.check-rv.outputs.new_patch }} check_rv_beta: ${{ steps.check-rv-beta.outputs.new_patch }} check_rex: ${{ steps.check-rex.outputs.new_patch }} - check_rex_anddea: ${{ steps.check-rex-anddea.outputs.new_patch }} + check_rex_anddea_stable: ${{ steps.check-rex-anddea-stable.outputs.new_patch }} + check_rex_anddea_beta: ${{ steps.check-rex-anddea-beta.outputs.new_patch }} check_rve: ${{ steps.check-rve.outputs.new_patch }} check_twitter_piko_stable: ${{ steps.check-twitter-piko-stable.outputs.new_patch }} check_twitter_piko_beta: ${{ steps.check-twitter-piko-beta.outputs.new_patch }} @@ -115,13 +120,20 @@ jobs: uses: ./.github/workflows/manual-patch.yml with: org: "ReX" - Patch-ReX-anddea: - name: Patch ReX forked by anddea + Patch-ReX-anddea-stable: + name: Patch ReX forked by anddea stable needs: check - if: ${{ needs.check.outputs.check_rex_anddea == 1 }} + if: ${{ needs.check.outputs.check_rex_anddea_stable == 1 }} uses: ./.github/workflows/manual-patch.yml with: - org: "ReX-anddea" + org: "ReX-anddea-stable" + Patch-ReX-anddea-beta: + name: Patch ReX forked by anddea beta + needs: check + if: ${{ needs.check.outputs.check_rex_anddea_beta == 1 }} + uses: ./.github/workflows/manual-patch.yml + with: + org: "ReX-anddea-beta" Patch-Revanced-Extended: name: Patch Revanced Extended needs: check diff --git a/.github/workflows/manual-patch.yml b/.github/workflows/manual-patch.yml index 14bd6ad..3e0ad19 100644 --- a/.github/workflows/manual-patch.yml +++ b/.github/workflows/manual-patch.yml @@ -20,7 +20,8 @@ on: - 'Revanced' - 'Revanced Beta' - 'ReX' - - 'Rex-anddea' + - 'Rex-anddea-stable' + - 'Rex-anddea-beta' - 'Revanced Extended' - 'Twitter Piko Stable' - 'Twitter Piko Beta' @@ -123,9 +124,9 @@ jobs: - name: Re-run workflow if github connection not stable if: always() && steps.patch-rex.outcome == 'skipped' || steps.patch-rex.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run - patch_rex_anddea: - name: Patch ReX forked by anddea - if: ${{ github.event.inputs.org == 'ReX-anddea' || github.event.inputs.org == 'All' || inputs.org == 'ReX-anddea' }} + patch_rex_anddea_stable: + name: Patch ReX forked by anddea stable + if: ${{ github.event.inputs.org == 'ReX-anddea-stable' || github.event.inputs.org == 'All' || inputs.org == 'ReX-anddea-stable' }} runs-on: ubuntu-latest steps: - name: Checkout @@ -133,18 +134,41 @@ jobs: - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection - id: check-gh-rex-anddea + id: check-gh-rex-anddea-stable run: bash src/etc/connection.sh - name: Patch apk id: patch-rex-anddea - if: steps.check-gh-rex-anddea.outputs.internet_error == '0' - run: bash src/build/ReX-anddea.sh + if: steps.check-gh-rex-anddea-stable.outputs.internet_error == '0' + run: bash src/build/ReX-anddea.sh latest - name: Releasing APK files - id: release-rex-anddea - if: steps.check-gh-rex-anddea.outputs.internet_error == '0' + id: release-rex-anddea-stable + if: steps.check-gh-rex-anddea-stable.outputs.internet_error == '0' uses: ./.github/actions/release - name: Re-run workflow if github connection not stable - if: always() && steps.patch-rex-anddea.outcome == 'skipped' || steps.release-rex-anddea.outcome == 'skipped' && env.retry_count < env.max_retries + if: always() && steps.patch-rex-anddea-stable.outcome == 'skipped' || steps.release-rex-anddea-stable.outcome == 'skipped' && env.retry_count < env.max_retries + uses: ./.github/actions/re-run + patch_rex_anddea_beta: + name: Patch ReX forked by anddea beta + if: ${{ github.event.inputs.org == 'ReX-anddea-beta' || github.event.inputs.org == 'All' || inputs.org == 'ReX-anddea-beta' }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: Preparing to patch + uses: ./.github/actions/preparing + - name: Check github connection + id: check-gh-rex-anddea-beta + run: bash src/etc/connection.sh + - name: Patch apk + id: patch-rex-anddea-beta + if: steps.check-gh-rex-anddea-beta.outputs.internet_error == '0' + run: bash src/build/ReX-anddea.sh prerelease + - name: Releasing APK files + id: release-rex-anddea-beta + if: steps.check-gh-rex-anddea-beta.outputs.internet_error == '0' + uses: ./.github/actions/release + - name: Re-run workflow if github connection not stable + if: always() && steps.patch-rex-anddea-beta.outcome == 'skipped' || steps.release-rex-anddea-beta.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run patch_rve: name: Patch Revanced Extended diff --git a/README.md b/README.md index 873240a..9619691 100644 --- a/README.md +++ b/README.md @@ -58,15 +58,13 @@ Download ### [ReX forked by anddea:](https://github.com/anddea/revanced-patches) -[All Architectures](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-ReX-anddea.apk) - -[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-arm64-v8a-ReX-anddea.apk) - -[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-armeabi-v7a-ReX-anddea.apk) - -[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86-ReX-anddea.apk) - -[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-ReX-anddea.apk) +| [Stable version](https://github.com/anddea/revanced-patches/releases/latest) | [Beta version](https://github.com/anddea/revanced-patches/releases) | +| --------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | +| [All Architectures](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-stable-ReX-anddea.apk) | [All Architectures](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-beta-ReX-anddea.apk) | +| [Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-stable-arm64-v8a-ReX-anddea.apk) | [Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-beta-arm64-v8a-ReX-anddea.apk) | +| [Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-stable-armeabi-v7a-ReX-anddea.apk) | [Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-beta-armeabi-v7a-ReX-anddea.apk) | +| [x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-stable-x86-ReX-anddea.apk) | [x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-beta-x86-ReX-anddea.apk) | +| [x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-stable-x86_64-ReX-anddea.apk) | [x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-beta-x86_64-ReX-anddea.apk) | ### [Revanced Extended: (Discontinued)](https://github.com/inotia00/revanced-patches/) @@ -172,9 +170,9 @@ Download ### [Piko:](https://github.com/crimera/piko) -| Stable version | Beta version | +| [Stable version](https://github.com/crimera/piko/releases/latest) | [Beta version](https://github.com/crimera/piko/releases/) | | --------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | -| [All Architectures](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitter-piko-stable.apk) | [All Architectures](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitter-piko-beta.apk) | +| [All Architectures](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitter-stable-piko.apk) | [All Architectures](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitter-beta-piko.apk) | --- diff --git a/src/build/Piko.sh b/src/build/Piko.sh index 2839ec3..f3588b2 100644 --- a/src/build/Piko.sh +++ b/src/build/Piko.sh @@ -4,31 +4,16 @@ source src/build/utils.sh # Patch Twitter Piko: patch_piko () { - get_apk "twitter" "twitter" "x-corp/twitter/twitter" - dl_gh "revanced-patches revanced-cli" "revanced" "latest" - mv revanced-patches*.jar _revanced-patches*.jar + dl_gh "revanced-cli" "revanced" "latest" + get_patches_key "twitter-pico" local v apk_name if [[ "$1" == "latest" ]]; then v="latest" apk_name="stable" else v="prerelease" apk_name="beta" fi - get_patches_key "twitter-pico" - if [ -f "./download/twitter.apk" ]; then - dl_gh "piko revanced-integrations" "crimera" "$v" - green_log "[+] Patch Twitter Pico:" - eval java -jar revanced-cli*.jar patch \ - --patch-bundle _revanced-patches*.jar \ - --patch-bundle revanced-patches*.jar \ - --merge revanced-integrations*.apk \ - $excludePatches\ - $includePatches \ - --out=./release/twitter-piko-$apk_name.apk \ - --keystore=./src/ks.keystore \ - ./download/twitter.apk - else - red_log "[-] Not found Twitter.apk" - exit 1 - fi + dl_gh "piko revanced-integrations" "crimera" "$v" + get_apk "twitter-$apk_name" "twitter" "x-corp/twitter/twitter" + patch "twitter-$apk_name" "piko" } patch_piko $1 \ No newline at end of file diff --git a/src/build/ReX-anddea.sh b/src/build/ReX-anddea.sh index 8ca3099..d3a3834 100644 --- a/src/build/ReX-anddea.sh +++ b/src/build/ReX-anddea.sh @@ -2,29 +2,26 @@ # ReX forked by anddea build source src/build/utils.sh -################################################# - -# Download requirements -dl_gh " revanced-patches revanced-integrations" "anddea" "latest" -dl_gh "revanced-cli" "inotia00" "latest" - -################################################# - -# Patch YouTube ReX anddea: -get_patches_key "youtube-ReX-anddea" -get_ver "Hide general ads" "com.google.android.youtube" -get_apk "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "ReX-anddea" "inotia" - - -################################################# - -rm -f revanced-cli* -dl_gh "revanced-cli" "FiorenMas" "latest" -# Split architecture Youtube: -get_patches_key "youtube-ReX-anddea" -for i in {0..3}; do - split_arch "youtube" "youtube-${archs[i]}-ReX-anddea" "$(gen_rip_libs ${libs[i]})" -done - -################################################# \ No newline at end of file +patch_ReX_anddea () { + # Patch YouTube ReX anddea: + dl_gh "revanced-cli" "inotia00" "latest" + get_patches_key "youtube-ReX-anddea" + local v apk_name + if [[ "$1" == "latest" ]]; then + v="latest" apk_name="stable" + else + v="prerelease" apk_name="beta" + fi + dl_gh " revanced-patches revanced-integrations" "anddea" "$v" + get_ver "Hide general ads" "com.google.android.youtube" + get_apk "youtube-$apk_name" "youtube" "google-inc/youtube/youtube" + patch "youtube-$apk_name" "ReX-anddea" "inotia" + # Split architecture Youtube: + rm -f revanced-cli* + dl_gh "revanced-cli" "FiorenMas" "latest" + get_patches_key "youtube-ReX-anddea" + for i in {0..3}; do + split_arch "youtube-$apk_name" "youtube-$apk_name-${archs[i]}-ReX-anddea" "$(gen_rip_libs ${libs[i]})" + done +} +patch_ReX_anddea $1 \ No newline at end of file diff --git a/src/patches/twitter-pico/exclude-patches b/src/patches/twitter-pico/exclude-patches index 5f1c681..e69de29 100644 --- a/src/patches/twitter-pico/exclude-patches +++ b/src/patches/twitter-pico/exclude-patches @@ -1,2 +0,0 @@ -Unlock downloads -Hide Recommended Users