added Revanced Beta

- Can patch and check new patch prerelease github
This commit is contained in:
yue374
2024-02-06 12:34:06 +07:00
parent c814336e83
commit 900c2c2c1c
10 changed files with 189 additions and 17 deletions

View File

@@ -15,23 +15,27 @@ jobs:
uses: actions/checkout@v4.1.1 uses: actions/checkout@v4.1.1
- name: Check new patch ReVanced - name: Check new patch ReVanced
id: check-rv 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 - name: Check new patch ReX
id: check-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 - name: Check new patch Revanced Extended
id: check-rve 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 - name: Check new patch Revanced For Android 6 & 7
id: check-rve67 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 - name: Check new patch Revanced For Android 5
id: check-rve5 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 - name: Keep workflow run
uses: gautamkrishnar/keepalive-workflow@v1 uses: gautamkrishnar/keepalive-workflow@v1
outputs: outputs:
check_rv: ${{ steps.check-rv.outputs.new_patch }} 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: ${{ steps.check-rex.outputs.new_patch }}
check_rve: ${{ steps.check-rve.outputs.new_patch }} check_rve: ${{ steps.check-rve.outputs.new_patch }}
check_rve67: ${{ steps.check-rve67.outputs.new_patch }} check_rve67: ${{ steps.check-rve67.outputs.new_patch }}
@@ -44,6 +48,13 @@ jobs:
uses: ./.github/workflows/manual-patch.yml uses: ./.github/workflows/manual-patch.yml
with: with:
org: "Revanced" 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: Patch-ReX:
name: Patch ReX name: Patch ReX
needs: check needs: check

View File

@@ -11,6 +11,7 @@ on:
options: options:
- 'All' - 'All'
- 'Revanced' - 'Revanced'
- 'Revanced Beta'
- 'ReX' - 'ReX'
- 'Revanced Extended' - 'Revanced Extended'
- 'Revanced Extended Android 6,7' - 'Revanced Extended Android 6,7'
@@ -45,6 +46,21 @@ jobs:
repository: ${{ github.repository }} repository: ${{ github.repository }}
- name: Releasing APK files - name: Releasing APK files
uses: ./.github/actions/release 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: patch_rex:
name: Patch ReX name: Patch ReX
if: ${{ github.event.inputs.org == 'ReX' || github.event.inputs.org == 'All' || inputs.org == 'ReX' }} if: ${{ github.event.inputs.org == 'ReX' || github.event.inputs.org == 'All' || inputs.org == 'ReX' }}

View File

@@ -6,8 +6,6 @@ They are open-source scripts for patching various apps like YouTube, YouTube Mus
<div align="center"> <div align="center">
[![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) [![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) ![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) [![](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 Download
</h1> </h1>
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) [![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) ### [Revanced:](https://github.com/revanced/revanced-patches)

51
docs/Beta.md Normal file
View File

@@ -0,0 +1,51 @@
<h1 align="center">
Download
</h1>
#### ⚠️ 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)

View File

@@ -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
#################################################

View File

@@ -6,7 +6,7 @@ source src/build/utils.sh
# Download requirements # Download requirements
dl_gh "revanced-patches-android5 revanced-integrations" "d4n3436" "latest" 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"
################################################# #################################################

View File

@@ -6,7 +6,7 @@ source src/build/utils.sh
# Download requirements # Download requirements
dl_gh "revanced-patches-android6-7 revanced-integrations" "kitadai31" "latest" 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"
################################################# #################################################

View File

@@ -16,18 +16,67 @@ red_log() {
# Download Github assets requirement: # Download Github assets requirement:
dl_gh() { dl_gh() {
local repo=$1
for repo in $1 ; do for repo in $1 ; do
wget -qO- "https://api.github.com/repos/$2/$repo/releases/$3" \ local owner=$2 tag=$3 found=0 assets=0
| jq -r '.assets[] | "\(.browser_download_url) \(.name)"' \ releases=$(wget -qO- "https://api.github.com/repos/$owner/$repo/releases")
| while read -r url names; do while read -r line; do
green_log "[+] Downloading $names from $2" if [[ $line == *"\"tag_name\":"* ]]; then
wget -q -O "$names" $url tag_name=$(echo $line | cut -d '"' -f 4)
done 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 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 list:
get_patches_key() { get_patches_key() {
excludePatches="" excludePatches=""

1
src/options/ReX.json Normal file
View File

@@ -0,0 +1 @@
[]

View File

@@ -0,0 +1 @@
[]