diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c1fc3f..7cc6520 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,23 +15,27 @@ jobs: uses: actions/checkout@v4.1.1 - name: Check new patch ReVanced id: check-rv - run: bash src/etc/ci.sh ReVanced/revanced-patches youtube-revanced.apk + run: bash src/etc/ci.sh ReVanced/revanced-patches latest youtube-revanced.apk + - name: Check new patch ReVanced Beta + id: check-rv-beta + run: bash src/etc/ci.sh ReVanced/revanced-patches prerelease youtube-beta-revanced.apk - name: Check new patch ReX id: check-rex - run: bash src/etc/ci.sh YT-Advanced/ReX-patches youtube-ReX.apk + run: bash src/etc/ci.sh YT-Advanced/ReX-patches latest youtube-ReX.apk - name: Check new patch Revanced Extended id: check-rve - run: bash src/etc/ci.sh inotia00/revanced-patches youtube-revanced-extended.apk + run: bash src/etc/ci.sh inotia00/revanced-patches latest youtube-revanced-extended.apk - name: Check new patch Revanced For Android 6 & 7 id: check-rve67 - run: bash src/etc/ci.sh kitadai31/revanced-patches-android6-7 youtube-revanced-extended-android-6-7.apk + run: bash src/etc/ci.sh kitadai31/revanced-patches-android6-7 latest youtube-revanced-extended-android-6-7.apk - name: Check new patch Revanced For Android 5 id: check-rve5 - run: bash src/etc/ci.sh d4n3436/revanced-patches-android5 youtube-revanced-extended-android-5.apk + run: bash src/etc/ci.sh d4n3436/revanced-patches-android5 latest youtube-revanced-extended-android-5.apk - name: Keep workflow run uses: gautamkrishnar/keepalive-workflow@v1 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: ${{ steps.check-rve.outputs.new_patch }} check_rve67: ${{ steps.check-rve67.outputs.new_patch }} @@ -44,6 +48,13 @@ jobs: uses: ./.github/workflows/manual-patch.yml with: org: "Revanced" + Patch-Revanced-Beta: + name: Patch Revanced Beta + needs: check + if: ${{ needs.check.outputs.check_rv_beta == 1 }} + uses: ./.github/workflows/manual-patch.yml + with: + org: "Revanced Beta" Patch-ReX: name: Patch ReX needs: check @@ -71,4 +82,4 @@ jobs: if: ${{ needs.check.outputs.check_rve5 == 1 }} uses: ./.github/workflows/manual-patch.yml with: - org: "Revanced Extended Android 5" + org: "Revanced Extended Android 5" \ No newline at end of file diff --git a/.github/workflows/manual-patch.yml b/.github/workflows/manual-patch.yml index c5eef0f..30ec617 100644 --- a/.github/workflows/manual-patch.yml +++ b/.github/workflows/manual-patch.yml @@ -11,6 +11,7 @@ on: options: - 'All' - 'Revanced' + - 'Revanced Beta' - 'ReX' - 'Revanced Extended' - 'Revanced Extended Android 6,7' @@ -45,6 +46,21 @@ jobs: repository: ${{ github.repository }} - name: Releasing APK files uses: ./.github/actions/release + patch_rv_beta: + name: Patch Revanced Beta + if: ${{ github.event.inputs.org == 'Revanced Beta' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Beta' }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: Preparing to patch + uses: ./.github/actions/preparing + - name: Patch apk + run: bash src/build/Revanced-Beta.sh + env: + repository: ${{ github.repository }} + - name: Releasing APK files + uses: ./.github/actions/release patch_rex: name: Patch ReX if: ${{ github.event.inputs.org == 'ReX' || github.event.inputs.org == 'All' || inputs.org == 'ReX' }} diff --git a/README.md b/README.md index 4d55f8f..e44eebe 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,6 @@ They are open-source scripts for patching various apps like YouTube, YouTube Mus
[![Image of https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root](https://github.com/FiorenMas/View-Counter/blob/main/repos/Revanced-And-Revanced-Extended-Non-Root_609906498/svg/count.svg)](https://github.com/FiorenMas/View-Counter) -[![CodeFactor](https://www.codefactor.io/repository/github/fiorenmas/revanced-and-revanced-extended-non-root/badge/main)](https://www.codefactor.io/repository/github/fiorenmas/revanced-and-revanced-extended-non-root/overview/main) -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/ea7a68dbfe8b4429ad8f84e49d3a4173)](https://app.codacy.com/gh/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/fiorenmas/Revanced-And-Revanced-Extended-Non-Root/ci.yml) [![](https://img.shields.io/badge/Telegram-2CA5E0)](https://t.me/fioren374) @@ -30,6 +28,8 @@ If you are an advanced user and you want to use custom patches for patching apps Download +If you want download beta version [Click Here](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/blob/main/docs/Beta.md) + [![YouTube](https://img.shields.io/badge/YouTube-%23FF0000.svg?style=for-the-badge&logo=YouTube&logoColor=white)](https://play.google.com/store/apps/details?id=com.google.android.youtube) ### [Revanced:](https://github.com/revanced/revanced-patches) @@ -277,4 +277,4 @@ Download [Revanced Extended for Android 5 Integrations](https://github.com/d4n3436/revanced-integrations) - [GPL-3.0](https://github.com/d4n3436/revanced-integrations/blob/revanced-extended/LICENSE) -[Revanced CLI - j-hc](https://github.com/j-hc/revanced-cli) - [GPL-3.0](https://github.com/j-hc/revanced-cli/blob/main/LICENSE) +[Revanced CLI - j-hc](https://github.com/j-hc/revanced-cli) - [GPL-3.0](https://github.com/j-hc/revanced-cli/blob/main/LICENSE) \ No newline at end of file diff --git a/docs/Beta.md b/docs/Beta.md new file mode 100644 index 0000000..93c1010 --- /dev/null +++ b/docs/Beta.md @@ -0,0 +1,51 @@ +

+Download +

+ +#### ⚠️ The APK files have the same package name as the stable version, so installing them will overwrite the stable version. + +[![YouTube](https://img.shields.io/badge/YouTube-%23FF0000.svg?style=for-the-badge&logo=YouTube&logoColor=white)](https://play.google.com/store/apps/details?id=com.google.android.youtube) + +### [Revanced:](https://github.com/revanced/revanced-patches) + +[All Architectures](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-beta-revanced.apk) + +[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-beta-arm64-v8a-revanced.apk) + +[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-beta-armeabi-v7a-revanced.apk) + +[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-beta-x86-revanced.apk) + +[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-beta-x86_64-revanced.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) + +### Revanced: + +[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-beta-arm64-v8a-revanced.apk) + +[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-beta-armeabi-v7a-revanced.apk) + +--- + +## [MicroG:](https://github.com/inotia00/VancedMicroG) + +[![Release](https://img.shields.io/github/v/release/inotia00/vancedmicrog?label=All-arch&style=for-the-badge)](https://github.com/inotia00/VancedMicroG/releases/latest/download/microg.apk) + +### [Built by Github Action](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/MicroG/MicroG.apk) + +--- + +## [MicroG-RE:](https://github.com/WSTxda/MicroG-RE) + +[![Release](https://img.shields.io/github/v/release/WSTxda/MicroG-RE?label=All-arch&style=for-the-badge)](https://github.com/WSTxda/MicroG-RE/releases) + +--- + +## [mMicroG:](https://github.com/kazimmt/mMicroG/) + +[![Release](https://img.shields.io/github/v/release/kazimmt/mMicroG?label=arm64-v8a&style=for-the-badge)](https://github.com/kazimmt/mMicroG/releases/latest/download/MicroG-arm64-v8a.apk) + +[![Release](https://img.shields.io/github/v/release/kazimmt/mMicroG?label=armeabi-v7a&style=for-the-badge)](https://github.com/ikazimmt/mMicroG/releases/latest/download/MicroG-armeabi-v7a.apk) \ No newline at end of file diff --git a/src/build/Revanced-Beta.sh b/src/build/Revanced-Beta.sh new file mode 100644 index 0000000..eeb9cad --- /dev/null +++ b/src/build/Revanced-Beta.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# Revanced build +source ./src/build/utils.sh + +################################################# + +# Download requirements +dl_gh "revanced-patches revanced-integrations" "revanced" "prerelease" +dl_gh "revanced-cli" "revanced" "latest" + +################################################# + +# Patch YouTube: +get_patches_key "youtube-revanced" +get_ver "Video ads" "com.google.android.youtube" +get_apk "youtube-beta" "youtube" "google-inc/youtube/youtube" +patch "youtube-beta" "revanced" + +################################################# + +# Patch YouTube Music: +# Arm64-v8a +get_patches_key "youtube-music-revanced" +get_apk "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" +patch "youtube-music-beta-arm64-v8a" "revanced" +# Armeabi-v7a +get_patches_key "youtube-music-revanced" +get_apk "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" +patch "youtube-music-beta-armeabi-v7a" "revanced" + +################################################# + +# Split architecture: +rm -f revanced-cli* revanced-patches*.jar patches.json +dl_gh "revanced-patches" "revanced" "prerelease" +dl_gh "revanced-cli" "FiorenMas" "latest" +# Split architecture Youtube: +get_patches_key "youtube-revanced" +for i in {0..3}; do + split_arch "youtube-beta" "youtube-beta-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})" +done + +################################################# \ No newline at end of file diff --git a/src/build/Revanced-Extended-Android-5.sh b/src/build/Revanced-Extended-Android-5.sh index b1399e7..7559712 100644 --- a/src/build/Revanced-Extended-Android-5.sh +++ b/src/build/Revanced-Extended-Android-5.sh @@ -6,7 +6,7 @@ source src/build/utils.sh # Download requirements dl_gh "revanced-patches-android5 revanced-integrations" "d4n3436" "latest" -dl_gh "revanced-cli" "revanced" "tags/v3.1.1" +dl_gh "revanced-cli" "revanced" "v3.1.1" ################################################# diff --git a/src/build/Revanced-Extended-Android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh index 4e3060b..8860279 100644 --- a/src/build/Revanced-Extended-Android-6-7.sh +++ b/src/build/Revanced-Extended-Android-6-7.sh @@ -6,7 +6,7 @@ source src/build/utils.sh # Download requirements dl_gh "revanced-patches-android6-7 revanced-integrations" "kitadai31" "latest" -dl_gh "revanced-cli" "revanced" "tags/v3.1.1" +dl_gh "revanced-cli" "revanced" "v3.1.1" ################################################# diff --git a/src/build/utils.sh b/src/build/utils.sh index 05e3b88..273aa41 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -16,18 +16,67 @@ red_log() { # Download Github assets requirement: dl_gh() { + local repo=$1 for repo in $1 ; do - wget -qO- "https://api.github.com/repos/$2/$repo/releases/$3" \ - | jq -r '.assets[] | "\(.browser_download_url) \(.name)"' \ - | while read -r url names; do - green_log "[+] Downloading $names from $2" - wget -q -O "$names" $url - done + local owner=$2 tag=$3 found=0 assets=0 + releases=$(wget -qO- "https://api.github.com/repos/$owner/$repo/releases") + while read -r line; do + if [[ $line == *"\"tag_name\":"* ]]; then + tag_name=$(echo $line | cut -d '"' -f 4) + if [ "$tag" == "$tag_name" ] || [ "$tag" == "latest" ] || [ "$tag" == "prerelease" ]; then + found=1 + else + found=0 + fi + fi + if [[ $line == *"\"prerelease\":"* ]]; then + prerelease=$(echo $line | cut -d ' ' -f 2 | tr -d ',') + if [ "$tag" == "prerelease" ] && [ "$prerelease" == "false" ]; then + found=0 + elif [ "$tag" == "latest" ] && [ "$prerelease" == "true" ]; then + found=0 + fi + fi + if [[ $line == *"\"assets\":"* ]]; then + if [ $found -eq 1 ]; then + assets=1 + fi + fi + if [[ $line == *"\"browser_download_url\":"* ]]; then + if [ $assets -eq 1 ]; then + url=$(echo $line | cut -d '"' -f 4) + name=$(basename "$url") + wget -q -O "$name" "$url" + green_log "[+] Downloading $name from $owner" + fi + fi + if [[ $line == *"],"* ]]; then + if [ $assets -eq 1 ]; then + assets=0 + break + fi + fi + done <<< "$releases" done } ################################################# +# Get patches list: +get_patches_key() { + excludePatches="" + includePatches="" + while IFS= read -r line1; do + excludePatches+=" -e \"$line1\"" + done < src/patches/$1/exclude-patches + export excludePatches + while IFS= read -r line2; do + includePatches+=" -i \"$line2\"" + done < src/patches/$1/include-patches + export includePatches +} +################################################# + # Get patches list: get_patches_key() { excludePatches="" diff --git a/src/options/ReX.json b/src/options/ReX.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/src/options/ReX.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/src/options/revanced-extended-android-5.json b/src/options/revanced-extended-android-5.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/src/options/revanced-extended-android-5.json @@ -0,0 +1 @@ +[] \ No newline at end of file