mirror of
https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root.git
synced 2025-12-06 08:07:40 +00:00
Optimize code
This commit is contained in:
siritami
60
.github/workflows/patch-6-7.yml
vendored
60
.github/workflows/patch-6-7.yml
vendored
@@ -1,60 +0,0 @@
|
||||
name: Patch Revanced Extended for Android 6 & 7
|
||||
on:
|
||||
# push:
|
||||
schedule:
|
||||
- cron: "0 10 */3 * *"
|
||||
workflow_dispatch:
|
||||
jobs:
|
||||
|
||||
patch2:
|
||||
name: Patch Revanced Extended for Android 6 & 7
|
||||
permissions: write-all
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Set up jdk
|
||||
uses: actions/setup-java@v3.11.0
|
||||
with:
|
||||
distribution: 'zulu'
|
||||
java-version: '17'
|
||||
|
||||
- name: Patch apk
|
||||
run: bash src/build/build-rve-android-6-7.sh
|
||||
|
||||
- name: Generate release info
|
||||
run: |
|
||||
echo "
|
||||
**Change log** :point_down:
|
||||
[Revanced](https://github.com/revanced/revanced-patches/releases/latest)
|
||||
[Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest)
|
||||
[Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/releases/latest)
|
||||
"> ${{ github.workspace }}-CHANGELOG.txt
|
||||
|
||||
- name: Release
|
||||
uses: softprops/action-gh-release@v0.1.15
|
||||
with:
|
||||
files: |
|
||||
./build/*
|
||||
revanced-extended-android-6-7-version.txt
|
||||
name: Revanced & Revanced Extended
|
||||
tag_name: all
|
||||
body_path: ${{ github.workspace }}-CHANGELOG.txt
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Delete older releases
|
||||
uses: dev-drprasad/delete-older-releases@v0.2.1
|
||||
with:
|
||||
keep_latest: 1
|
||||
delete_tags: true
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Delete workflow runs
|
||||
uses: Mattraks/delete-workflow-runs@v2
|
||||
with:
|
||||
token: ${{ github.token }}
|
||||
repository: ${{ github.repository }}
|
||||
retain_days: 0
|
||||
keep_minimum_runs: 15
|
||||
55
.github/workflows/patch.yml
vendored
55
.github/workflows/patch.yml
vendored
@@ -1,4 +1,4 @@
|
||||
name: Patch Revanced
|
||||
name: Patch
|
||||
on:
|
||||
# push:
|
||||
schedule:
|
||||
@@ -110,3 +110,56 @@ jobs:
|
||||
repository: ${{ github.repository }}
|
||||
retain_days: 0
|
||||
keep_minimum_runs: 15
|
||||
|
||||
patch3:
|
||||
name: Patch Revanced Extended for Android 6 & 7
|
||||
permissions: write-all
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Set up jdk
|
||||
uses: actions/setup-java@v3.11.0
|
||||
with:
|
||||
distribution: 'zulu'
|
||||
java-version: '17'
|
||||
|
||||
- name: Patch apk
|
||||
run: bash src/build/build-rve-android-6-7.sh
|
||||
|
||||
- name: Generate release info
|
||||
run: |
|
||||
echo "
|
||||
**Change log** :point_down:
|
||||
[Revanced](https://github.com/revanced/revanced-patches/releases/latest)
|
||||
[Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest)
|
||||
[Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/releases/latest)
|
||||
"> ${{ github.workspace }}-CHANGELOG.txt
|
||||
|
||||
- name: Release
|
||||
uses: softprops/action-gh-release@v0.1.15
|
||||
with:
|
||||
files: |
|
||||
./build/*
|
||||
revanced-extended-android-6-7-version.txt
|
||||
name: Revanced & Revanced Extended
|
||||
tag_name: all
|
||||
body_path: ${{ github.workspace }}-CHANGELOG.txt
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Delete older releases
|
||||
uses: dev-drprasad/delete-older-releases@v0.2.1
|
||||
with:
|
||||
keep_latest: 1
|
||||
delete_tags: true
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Delete workflow runs
|
||||
uses: Mattraks/delete-workflow-runs@v2
|
||||
with:
|
||||
token: ${{ github.token }}
|
||||
repository: ${{ github.repository }}
|
||||
retain_days: 0
|
||||
keep_minimum_runs: 15
|
||||
|
||||
@@ -16,21 +16,13 @@ exit 0
|
||||
else
|
||||
rm -f *.txt
|
||||
|
||||
dl_gh "revanced-patches revanced-integrations" "revanced" "latest"
|
||||
dl_gh "revanced-cli" "j-hc" "latest"
|
||||
dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
|
||||
|
||||
# Patch YouTube
|
||||
get_patches_key "youtube-revanced"
|
||||
get_ver "video-ads" "com.google.android.youtube"
|
||||
get_apk "youtube" "youtube" "google-inc/youtube/youtube"
|
||||
patch "youtube" "youtube-revanced"
|
||||
change_arch "youtube-revanced" "youtube-revanced-arm64-v8a" "--rip-lib x86_64 --rip-lib x86 --rip-lib armeabi-v7a"
|
||||
change_arch "youtube-revanced" "youtube-revanced-armeabi-v7a" "--rip-lib x86_64 --rip-lib x86 --rip-lib arm64-v8a"
|
||||
change_arch "youtube-revanced" "youtube-revanced-x86_64" "--rip-lib x86 --rip-lib armeabi-v7a --rip-lib arm64-v8a"
|
||||
change_arch "youtube-revanced" "youtube-revanced-x86" "--rip-lib x86_64 --rip-lib armeabi-v7a --rip-lib arm64-v8a"
|
||||
|
||||
rm -f revanced-cli* revanced-patches* revanced-integrations*
|
||||
dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
|
||||
|
||||
# Patch Instagram
|
||||
get_patches_key "instagram"
|
||||
@@ -80,5 +72,12 @@ version="9.86.0-release.0"
|
||||
get_apk "twitter" "twitter" "twitter-inc/twitter/twitter"
|
||||
patch "twitter" "twitter-revanced"
|
||||
|
||||
# Change architecture
|
||||
rm -f revanced-cli*
|
||||
dl_gh "revanced-cli" "j-hc" "latest"
|
||||
for i in {0..3}; do
|
||||
change_arch "youtube-revanced" "youtube-revanced-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
|
||||
done
|
||||
|
||||
ls revanced-patches*.jar >> revanced-version.txt
|
||||
fi
|
||||
|
||||
@@ -14,10 +14,10 @@ if diff -q revanced-extended-android-6-7-version.txt new.txt >/dev/null ; then
|
||||
echo "Old patch!!! Not build"
|
||||
exit 0
|
||||
else
|
||||
rm -f *.tx
|
||||
rm -f *.txt
|
||||
|
||||
dl_gh "revanced-patches-android6-7 revanced-integrations" "kitadai31" "latest"
|
||||
dl_gh "revanced-cli" "j-hc" "latest"
|
||||
dl_gh "revanced-cli" "inotia00" "latest"
|
||||
|
||||
# Patch YouTube Extended
|
||||
get_patches_key "youtube-revanced-extended-6-7"
|
||||
@@ -25,10 +25,13 @@ version="17.34.36"
|
||||
#get_ver "hide-general-ads" "com.google.android.youtube"
|
||||
get_apk "youtube" "youtube" "google-inc/youtube/youtube"
|
||||
patch "youtube" "youtube-revanced-extended-android-6-7"
|
||||
change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-arm64-v8a" "--rip-lib x86_64 --rip-lib x86 --rip-lib armeabi-v7a"
|
||||
change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-armeabi-v7a" "--rip-lib x86_64 --rip-lib x86 --rip-lib arm64-v8a"
|
||||
change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-x86_64" "--rip-lib x86 --rip-lib armeabi-v7a --rip-lib arm64-v8a"
|
||||
change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-x86" "--rip-lib x86_64 --rip-lib armeabi-v7a --rip-lib arm64-v8a"
|
||||
|
||||
# Change architecture
|
||||
rm -f revanced-cli*
|
||||
dl_gh "revanced-cli" "j-hc" "latest"
|
||||
for i in {0..3}; do
|
||||
change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
|
||||
done
|
||||
|
||||
ls revanced-patches*.jar >> revanced-extended-android-6-7-version.txt
|
||||
fi
|
||||
|
||||
@@ -16,8 +16,7 @@ exit 0
|
||||
else
|
||||
rm -f *.txt
|
||||
|
||||
dl_gh "revanced-patches revanced-integrations" "inotia00" "latest"
|
||||
dl_gh "revanced-cli" "j-hc" "latest"
|
||||
dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "latest"
|
||||
|
||||
# Patch YouTube Extended
|
||||
get_patches_key "youtube-revanced-extended"
|
||||
@@ -25,17 +24,18 @@ get_patches_key "youtube-revanced-extended"
|
||||
get_ver "hide-general-ads" "com.google.android.youtube"
|
||||
get_apk "youtube" "youtube" "google-inc/youtube/youtube"
|
||||
patch "youtube" "youtube-revanced-extended"
|
||||
change_arch "youtube-revanced-extended" "youtube-revanced-extended-arm64-v8a" "--rip-lib x86_64 --rip-lib x86 --rip-lib armeabi-v7a"
|
||||
change_arch "youtube-revanced-extended" "youtube-revanced-extended-armeabi-v7a" "--rip-lib x86_64 --rip-lib x86 --rip-lib arm64-v8a"
|
||||
change_arch "youtube-revanced-extended" "youtube-revanced-extended-x86_64" "--rip-lib x86 --rip-lib armeabi-v7a --rip-lib arm64-v8a"
|
||||
change_arch "youtube-revanced-extended" "youtube-revanced-extended-x86" "--rip-lib x86_64 --rip-lib armeabi-v7a --rip-lib arm64-v8a"
|
||||
|
||||
dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "latest"
|
||||
|
||||
# Patch YouTube Music Extended
|
||||
get_patches_key "youtube-music-revanced-extended"
|
||||
get_apk_arch "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-music"
|
||||
patch "youtube-music" "youtube-music-revanced-extended"
|
||||
|
||||
# Change architecture
|
||||
rm -f revanced-cli*
|
||||
dl_gh "revanced-cli" "j-hc" "latest"
|
||||
for i in {0..3}; do
|
||||
change_arch "youtube-revanced-extended" "youtube-revanced-extended-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
|
||||
done
|
||||
|
||||
ls revanced-patches*.jar >> revanced-extended-version.txt
|
||||
fi
|
||||
|
||||
@@ -85,7 +85,7 @@ patch() {
|
||||
-a $1.apk \
|
||||
${EXCLUDE_PATCHES[@]} \
|
||||
${INCLUDE_PATCHES[@]} \
|
||||
--keystore=ks.keystore \
|
||||
--keystore=./src/ks.keystore \
|
||||
-o ./build/$2.apk
|
||||
unset version
|
||||
unset EXCLUDE_PATCHES
|
||||
@@ -94,12 +94,20 @@ patch() {
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
archs=("arm64-v8a" "armeabi-v7a" "x86_64" "x86")
|
||||
libs=("x86_64 x86 armeabi-v7a" "x86_64 x86 arm64-v8a" "x86 armeabi-v7a arm64-v8a" "x86_64 armeabi-v7a arm64-v8a")
|
||||
gen_rip_libs() {
|
||||
for lib in $@; do
|
||||
echo -n "--rip-lib $lib "
|
||||
done
|
||||
}
|
||||
change_arch() {
|
||||
if [ -f "./build/$1.apk" ]; then
|
||||
java -jar revanced-cli*.jar \
|
||||
-b revanced-patches*.jar \
|
||||
-a ./build/$1.apk \
|
||||
--keystore=ks.keystore \
|
||||
--keystore=./src/ks.keystore \
|
||||
$3 \
|
||||
-o ./build/$2.apk
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user