From 5ef1e59b902474214538f6f623b7093c234bb262 Mon Sep 17 00:00:00 2001 From: siritami <102145692+FiorenMas@users.noreply.github.com> Date: Wed, 10 Jul 2024 23:09:56 +0700 Subject: [PATCH] update - Disable check update discontinued project. hide in readme.md discontinued project. - Change some name - RVE split to RVE reddit to patch arsclib patches - Correct version lightroom --- .github/workflows/ci.yml | 46 ++++++---------- .github/workflows/manual-patch.yml | 44 ++++++++++++---- README.md | 76 ++++++++++++++++----------- src/build/Revanced-3.sh | 1 + src/build/Revanced-Beta-3.sh | 1 + src/build/Revanced-Extended-Beta.sh | 14 +---- src/build/Revanced-Extended-Reddit.sh | 19 +++++++ src/build/Revanced-Extended.sh | 14 +---- 8 files changed, 119 insertions(+), 96 deletions(-) create mode 100644 src/build/Revanced-Extended-Reddit.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a01370..a432278 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,10 +29,6 @@ jobs: id: check-rv-beta if: steps.check-gh.outputs.internet_error == '0' run: bash src/etc/ci.sh ReVanced/revanced-patches prerelease youtube-beta-revanced.apk - - name: Check new patch ReX - 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 Revanced Extended forked by Anddea Stable Version id: check-rve-anddea-stable if: steps.check-gh.outputs.internet_error == '0' @@ -41,10 +37,6 @@ jobs: id: check-rve-anddea-beta if: steps.check-gh.outputs.internet_error == '0' run: bash src/etc/ci.sh anddea/revanced-patches prerelease youtube-beta-anddea.apk - - name: Check new patch Revanced Extended forked by Rufusin Stable Version - id: check-rve-rufusin - if: steps.check-gh.outputs.internet_error == '0' - run: bash src/etc/ci.sh rufusin/revanced-patches latest youtube-rufusin.apk - name: Check new patch Revanced Extended id: check-rve if: steps.check-gh.outputs.internet_error == '0' @@ -53,6 +45,10 @@ jobs: id: check-rve-beta if: steps.check-gh.outputs.internet_error == '0' run: bash src/etc/ci.sh inotia00/revanced-patches prerelease youtube-beta-revanced-extended.apk + - name: Check new patch Revanced Extended Reddit + id: check-rve-reddit + if: steps.check-gh.outputs.internet_error == '0' + run: bash src/etc/ci.sh inotia00/revanced-patches-reddit latest reddit-revanced-extended.apk - name: Check new patch Twitter Piko Stable id: check-twitter-piko-stable if: steps.check-gh.outputs.internet_error == '0' @@ -98,19 +94,18 @@ jobs: outputs: 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_rve_anddea_stable: ${{ steps.check-rve-anddea-stable.outputs.new_patch }} check_rve_anddea_beta: ${{ steps.check-rve-anddea-beta.outputs.new_patch }} - check_rve_rufusin: ${{ steps.check-rve-rufusin.outputs.new_patch }} check_rve: ${{ steps.check-rve.outputs.new_patch }} check_rve_beta: ${{ steps.check-rve-beta.outputs.new_patch }} + check_rve_reddit: ${{ steps.check-rve-reddit.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 }} check_rve67: ${{ steps.check-rve67.outputs.new_patch }} check_rve5: ${{ steps.check-rve5.outputs.new_patch }} Patch-Revanced: - name: Patch Revanced + name: Patch Revanced Stable needs: check if: ${{ needs.check.outputs.check_rv == 1 }} uses: ./.github/workflows/manual-patch.yml @@ -123,34 +118,20 @@ jobs: uses: ./.github/workflows/manual-patch.yml with: org: "Revanced Beta" - Patch-ReX: - name: Patch ReX - needs: check - if: ${{ needs.check.outputs.check_rex == 1 }} - uses: ./.github/workflows/manual-patch.yml - with: - org: "ReX" Patch-RVE-anddea-stable: - name: Patch Revanced Extended forked by Anddea Stable Version + name: Patch RVX Anddea Stable needs: check if: ${{ needs.check.outputs.check_rve_anddea_stable == 1 }} uses: ./.github/workflows/manual-patch.yml with: org: "RVE-anddea-stable" Patch-RVE-anddea-beta: - name: Patch Revanced Extended forked by Anddea Beta Version + name: Patch RVX Anddea Beta needs: check if: ${{ needs.check.outputs.check_rve_anddea_beta == 1 }} uses: ./.github/workflows/manual-patch.yml with: org: "RVE-anddea-beta" - Patch-RVE-rufusin: - name: Patch Revanced Extended forked by Rufusin - needs: check - if: ${{ needs.check.outputs.check_rve_rufusin == 1 }} - uses: ./.github/workflows/manual-patch.yml - with: - org: "RVE-rufusin" Patch-Revanced-Extended: name: Patch Revanced Extended needs: check @@ -165,6 +146,13 @@ jobs: uses: ./.github/workflows/manual-patch.yml with: org: "Revanced Extended Beta" + Patch-Revanced-Extended-Reddit: + name: Patch Revanced Extended Reddit + needs: check + if: ${{ needs.check.outputs.check_rve_reddit == 1 }} + uses: ./.github/workflows/manual-patch.yml + with: + org: "Revanced Extended Reddit" Patch-Twitter-Piko-Stable: name: Patch Twitter Piko Stable needs: check @@ -180,14 +168,14 @@ jobs: with: org: "Twitter Piko Beta" Patch-Revanced-Extended-For-Android-6-7: - name: Patch Revanced Extended For Android 6 & 7 + name: Patch RVX Android 6 & 7 needs: check if: ${{ needs.check.outputs.check_rve67 == 1 }} uses: ./.github/workflows/manual-patch.yml with: org: "Revanced Extended Android 6,7" Patch-Revanced-Extended-For-Android-5: - name: Patch Revanced Extended For Android 5 + name: Patch RVX Android 5 needs: check if: ${{ needs.check.outputs.check_rve5 == 1 }} uses: ./.github/workflows/manual-patch.yml diff --git a/.github/workflows/manual-patch.yml b/.github/workflows/manual-patch.yml index 2fcf969..70d51ed 100644 --- a/.github/workflows/manual-patch.yml +++ b/.github/workflows/manual-patch.yml @@ -21,14 +21,15 @@ on: - 'Revanced Beta' - 'Revanced Extended' - 'Revanced Extended Beta' - - 'ReX' + - 'Revanced Extended Reddit' - 'RVE-anddea-stable' - 'RVE-anddea-beta' - - 'RVE-rufusin' - 'Twitter Piko Stable' - 'Twitter Piko Beta' - 'Revanced Extended Android 6,7' - 'Revanced Extended Android 5' + - 'ReX' + - 'RVE-rufusin' retry_count: description: 'Do not change value below' required: false @@ -40,7 +41,7 @@ on: type: string jobs: patch_rv: - name: Patch Revanced Stable version + name: Patch Revanced Stable if: ${{ github.event.inputs.org == 'Revanced' || github.event.inputs.org == 'All' || inputs.org == 'Revanced' }} runs-on: ubuntu-latest strategy: @@ -72,7 +73,7 @@ jobs: if: always() && steps.patch-rv.outcome == 'skipped' || steps.release-rv.outcome == 'skipped' && env.retry_count < env.max_retries && matrix.Include.run == '1' uses: ./.github/actions/re-run patch_rv_beta: - name: Patch Revanced Beta version + name: Patch Revanced Beta if: ${{ github.event.inputs.org == 'Revanced Beta' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Beta' }} runs-on: ubuntu-latest strategy: @@ -127,7 +128,7 @@ jobs: if: always() && steps.patch-rex.outcome == 'skipped' || steps.release-rex.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run patch_rve_anddea_stable: - name: Patch Revanced Extended forked by Anddea Stable version + name: Patch RVX Anddea Stable if: ${{ github.event.inputs.org == 'RVE-anddea-stable' || github.event.inputs.org == 'All' || inputs.org == 'RVE-anddea-stable' }} runs-on: ubuntu-latest steps: @@ -150,7 +151,7 @@ jobs: if: always() && steps.patch-rve-anddea-stable.outcome == 'skipped' || steps.release-rve-anddea-stable.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run patch_rve_anddea_beta: - name: Patch Revanced Extended forked by Anddea Beta version + name: Patch RVX Anddea Beta version if: ${{ github.event.inputs.org == 'RVE-anddea-beta' || github.event.inputs.org == 'All' || inputs.org == 'RVE-anddea-beta' }} runs-on: ubuntu-latest steps: @@ -173,7 +174,7 @@ jobs: if: always() && steps.patch-rve-anddea-beta.outcome == 'skipped' || steps.release-rve-anddea-beta.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run patch_rve_rufusin_stable: - name: Patch Revanced Extended forked by Rufusin Stable version + name: Patch RVX Rufusin Stable if: ${{ github.event.inputs.org == 'RVE-rufusin' || github.event.inputs.org == 'All' || inputs.org == 'RVE-rufusin' }} runs-on: ubuntu-latest steps: @@ -196,7 +197,7 @@ jobs: if: always() && steps.patch-rve-rufusin-stable.outcome == 'skipped' || steps.release-rve-rufusin-stable.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run patch_rve: - name: Patch Revanced Extended + name: Patch Revanced Extended Stable if: ${{ github.event.inputs.org == 'Revanced Extended' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended' }} runs-on: ubuntu-latest steps: @@ -241,6 +242,29 @@ jobs: - name: Re-run workflow if github connection not stable if: always() && steps.patch-rve-beta.outcome == 'skipped' || steps.release-rve-beta.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run + patch_rve_reddit: + name: Patch Revanced Extended Reddit + if: ${{ github.event.inputs.org == 'Revanced Extended Reddit' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended Reddit' }} + 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-rve-reddit + run: bash src/etc/connection.sh + - name: Patch apk + id: patch-rve-reddit + if: steps.check-gh-rve-reddit.outputs.internet_error == '0' + run: bash src/build/Revanced-Extended-Reddit.sh + - name: Releasing APK files + id: release-rve-reddit + if: steps.check-gh-rve-reddit.outputs.internet_error == '0' + uses: ./.github/actions/release + - name: Re-run workflow if github connection not stable + if: always() && steps.patch-rve-reddit.outcome == 'skipped' || steps.release-rve-reddit.outcome == 'skipped' && env.retry_count < env.max_retries + uses: ./.github/actions/re-run patch_twitter_piko_stable: name: Patch Twitter Piko Stable if: ${{ github.event.inputs.org == 'Twitter Piko Stable' || github.event.inputs.org == 'All' || inputs.org == 'Twitter Piko Stable' }} @@ -288,7 +312,7 @@ jobs: if: always() && steps.patch-piko-beta.outcome == 'skipped' || steps.release-piko-beta.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run patch_rve67: - name: Patch Revanced Extended Android 6,7 + name: Patch RVX Android 6,7 if: ${{ github.event.inputs.org == 'Revanced Extended Android 6,7' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended Android 6,7' }} runs-on: ubuntu-latest steps: @@ -311,7 +335,7 @@ jobs: if: always() && steps.patch-rve67.outcome == 'skipped' || steps.release-rve67.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run patch_rve5: - name: Patch Revanced Extended Android 5 + name: Patch RVX Android 5 if: ${{ github.event.inputs.org == 'Revanced Extended Android 5' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended Android 5' }} runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index ba6050f..203cbdf 100644 --- a/README.md +++ b/README.md @@ -72,30 +72,6 @@ Download | [x86](../../releases/download/all/youtube-stable-x86-anddea.apk) | [x86](../../releases/download/all/youtube-beta-x86-anddea.apk) | | [x86_64](../../releases/download/all/youtube-stable-x86_64-anddea.apk) | [x86_64](../../releases/download/all/youtube-beta-x86_64-anddea.apk) | -### [Revanced Extended forked by rufusin:](https://github.com/rufusin/revanced-patches) - -[All Architectures](../../releases/download/all/youtube-rufusin.apk) - -[Arm64-v8a](../../releases/download/all/youtube-arm64-v8a-rufusin.apk) - -[Armeabi-v7a](../../releases/download/all/youtube-armeabi-v7a-rufusin.apk) - -[x86](../../releases/download/all/youtube-x86-rufusin.apk) - -[x86_64](../../releases/download/all/youtube-x86_64-rufusin.apk) - -### [ReX: (forked from Revanced Extended)](https://github.com/YT-Advanced/ReX-patches) - -[All Architectures](../../releases/download/all/youtube-ReX.apk) - -[Arm64-v8a](../../releases/download/all/youtube-arm64-v8a-ReX.apk) - -[Armeabi-v7a](../../releases/download/all/youtube-armeabi-v7a-ReX.apk) - -[x86](../../releases/download/all/youtube-x86-ReX.apk) - -[x86_64](../../releases/download/all/youtube-x86_64-ReX.apk) - ### [Revanced Extended For Android 6 & 7:](https://github.com/kitadai31/revanced-patches-android6-7/tree/revanced-extended) [All Architectures](../../releases/download/all/youtube-revanced-extended-android-6-7.apk) @@ -121,6 +97,35 @@ Download [x86_64](../../releases/download/all/youtube-x86_64-revanced-extended-android-5.apk) +
+ Discontinued project + +### [Revanced Extended forked by rufusin:](https://github.com/rufusin/revanced-patches) + +[All Architectures](../../releases/download/all/youtube-rufusin.apk) + +[Arm64-v8a](../../releases/download/all/youtube-arm64-v8a-rufusin.apk) + +[Armeabi-v7a](../../releases/download/all/youtube-armeabi-v7a-rufusin.apk) + +[x86](../../releases/download/all/youtube-x86-rufusin.apk) + +[x86_64](../../releases/download/all/youtube-x86_64-rufusin.apk) + +### [ReX: (forked from Revanced Extended)](https://github.com/YT-Advanced/ReX-patches) + +[All Architectures](../../releases/download/all/youtube-ReX.apk) + +[Arm64-v8a](../../releases/download/all/youtube-arm64-v8a-ReX.apk) + +[Armeabi-v7a](../../releases/download/all/youtube-armeabi-v7a-ReX.apk) + +[x86](../../releases/download/all/youtube-x86-ReX.apk) + +[x86_64](../../releases/download/all/youtube-x86_64-ReX.apk) + +
+ --- [![YouTube Music](https://img.shields.io/badge/YouTube_Music-FF0000?style=for-the-badge&logo=youtube-music&logoColor=white)](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music) @@ -146,12 +151,17 @@ Download | [Arm64-v8a](../../releases/download/all/youtube-music-stable-arm64-v8a-anddea.apk) | [Arm64-v8a](../../releases/download/all/youtube-music-beta-arm64-v8a-anddea.apk) | | [Armeabi-v7a](../../releases/download/all/youtube-music-stable-armeabi-v7a-anddea.apk) | [Armeabi-v7a](../../releases/download/all/youtube-music-beta-armeabi-v7a-anddea.apk) | +
+ Discontinued project + ### ReX: [Arm64-v8a](../../releases/download/all/youtube-music-arm64-v8a-ReX.apk) [Armeabi-v7a](../../releases/download/all/youtube-music-armeabi-v7a-ReX.apk) +
+ --- [![Facebook](https://img.shields.io/badge/Facebook-%231877F2.svg?style=for-the-badge&logo=Facebook&logoColor=white)](https://play.google.com/store/apps/details?id=com.facebook.katana&hl) @@ -222,18 +232,22 @@ Download [![Reddit](https://img.shields.io/badge/Reddit-%23FF4500.svg?style=for-the-badge&logo=Reddit&logoColor=white)](https://play.google.com/store/apps/details?id=com.reddit.frontpage) -### Revanced: - -| Stable version | Beta version | -| -------------------------------------------------------------------- | ------------------------------------------------------------------------- | -| [All Architectures](../../releases/download/all/reddit-revanced.apk) | [All Architectures](../../releases/download/all/reddit-beta-revanced.apk) | - -### Revanced Extended: +### Revanced Extended: (Version 2024.18.0+) | [Stable version](https://github.com/inotia00/revanced-patches/releases/latest) | [Beta version](https://github.com/inotia00/revanced-patches/releases) | | ------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------- | | [All Architectures](../../releases/download/all/reddit-revanced-extended.apk) | [All Architectures](../../releases/download/all/reddit-beta-revanced-extended.apk) | +### Revanced: +
+ Old version maybe bugs + +| Stable version | Beta version | +| -------------------------------------------------------------------- | ------------------------------------------------------------------------- | +| [All Architectures](../../releases/download/all/reddit-revanced.apk) | [All Architectures](../../releases/download/all/reddit-beta-revanced.apk) | + +
+ --- [![Lightroom](https://img.shields.io/badge/Adobe%20Lightroom-31A8FF.svg?style=for-the-badge&logo=Adobe%20Lightroom&logoColor=white)](https://play.google.com/store/apps/details?id=com.adobe.lrmobile) diff --git a/src/build/Revanced-3.sh b/src/build/Revanced-3.sh index 1061ad8..55241c9 100644 --- a/src/build/Revanced-3.sh +++ b/src/build/Revanced-3.sh @@ -27,6 +27,7 @@ patch "pixiv" "revanced" # Patch Lightroom: get_patches_key "lightroom" +version="9.2.2" get_apk "com.adobe.lrmobile" "lightroom" "lightroom" "adobe/lightroom/lightroom" "arm64-v8a" patch "lightroom" "revanced" diff --git a/src/build/Revanced-Beta-3.sh b/src/build/Revanced-Beta-3.sh index 6a98ccd..d0fbaf8 100644 --- a/src/build/Revanced-Beta-3.sh +++ b/src/build/Revanced-Beta-3.sh @@ -28,6 +28,7 @@ patch "pixiv-beta" "revanced" # Patch Lightroom: get_patches_key "lightroom" +version="9.2.2" get_apk "com.adobe.lrmobile" "lightroom-beta" "lightroom" "adobe/lightroom/lightroom" "arm64-v8a" patch "lightroom-beta" "revanced" diff --git a/src/build/Revanced-Extended-Beta.sh b/src/build/Revanced-Extended-Beta.sh index fa3cdd4..f0e5986 100644 --- a/src/build/Revanced-Extended-Beta.sh +++ b/src/build/Revanced-Extended-Beta.sh @@ -32,16 +32,4 @@ patch "youtube-music-beta-armeabi-v7a" "revanced-extended" "inotia" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-beta-revanced-extended" "youtube-beta-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})" -done - -################################################# -# Patch Reddit: -rm -f revanced-cli* revanced-patches* *.json -dl_gh "revanced-cli" "inotia00" "v2.21.2-arsclib" -dl_gh "revanced-patches" "inotia00" "v2.174.0-arsclib" -get_patches_key "reddit-rve" -get_apk "com.reddit.frontpage" "reddit-beta" "reddit" "redditinc/reddit/reddit" -patch "reddit-beta" "revanced-extended" -mv ./release/reddit-beta-revanced-extended.apk/base.apk ./reddit-beta-revanced-extended.apk -rm -f -d ./release/reddit-beta-revanced-extended.apk -mv ./reddit-beta-revanced-extended.apk ./release/reddit-beta-revanced-extended.apk +done \ No newline at end of file diff --git a/src/build/Revanced-Extended-Reddit.sh b/src/build/Revanced-Extended-Reddit.sh new file mode 100644 index 0000000..c40b160 --- /dev/null +++ b/src/build/Revanced-Extended-Reddit.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# Revanced Extended Arsclib build +source src/build/utils.sh + +################################################# + +# Download requirements +dl_gh "revanced-patches-arsclib revanced-integrations revanced-cli-arsclib" "inotia00" "latest" + +################################################# + +# Patch Reddit: +get_patches_key "reddit-rve" +version="2024.25.3" +get_apk "com.reddit.frontpage" "reddit" "reddit" "redditinc/reddit/reddit" +patch "reddit" "revanced-extended" +mv ./release/reddit-revanced-extended.apk/base.apk ./reddit-revanced-extended.apk +rm -f -d ./release/reddit-revanced-extended.apk +mv ./reddit-revanced-extended.apk ./release/reddit-revanced-extended.apk \ No newline at end of file diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended.sh index 7fd599f..ae6b792 100644 --- a/src/build/Revanced-Extended.sh +++ b/src/build/Revanced-Extended.sh @@ -31,16 +31,4 @@ patch "youtube-music-armeabi-v7a" "revanced-extended" "inotia" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})" -done - -################################################# -# Patch Reddit: -rm -f revanced-cli* revanced-patches* *.json -dl_gh "revanced-cli" "inotia00" "v2.21.2-arsclib" -dl_gh "revanced-patches" "inotia00" "v2.175.0-arsclib" -get_patches_key "reddit-rve" -get_apk "com.reddit.frontpage" "reddit" "reddit" "redditinc/reddit/reddit" -patch "reddit" "revanced-extended" -mv ./release/reddit-revanced-extended.apk/base.apk ./reddit-revanced-extended.apk -rm -f -d ./release/reddit-revanced-extended.apk -mv ./reddit-revanced-extended.apk ./release/reddit-revanced-extended.apk +done \ No newline at end of file