From b6535c66daf7b2f4f4d8aaba04240cfee31943b8 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Tue, 18 Oct 2022 21:28:29 +0530 Subject: [PATCH 1/7] =?UTF-8?q?=E2=9C=A8=20Rip=20Libs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/downloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/downloader.py b/src/downloader.py index b28aa03..31b54a5 100644 --- a/src/downloader.py +++ b/src/downloader.py @@ -165,7 +165,7 @@ class Downloader(object): def download_revanced(self) -> None: """Download Revanced and Extended Patches, Integration and CLI.""" assets = [ - ["revanced", "revanced-cli", self.config.normal_cli_jar], + ["j-hc", "revanced-cli", self.config.normal_cli_jar], ["revanced", "revanced-integrations", self.config.normal_integrations_apk], ["revanced", "revanced-patches", self.config.normal_patches_jar], ] From d78e989f9fd892b98cbf5ad8416e456036c0977a Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Tue, 18 Oct 2022 21:36:18 +0530 Subject: [PATCH 2/7] =?UTF-8?q?=E2=9C=A8=20Rip=20armeabi-v7a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/parser.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/parser.py b/src/parser.py index c3ed9b2..250b975 100644 --- a/src/parser.py +++ b/src/parser.py @@ -103,6 +103,8 @@ class Parser(object): if self._PATCHES: args.extend(self._PATCHES) + args.append("--rip-lib") + args.append("armeabi-v7a") start = perf_counter() process = Popen(["java", *args], stdout=PIPE) From 95264ef4e41e74b21e8dd9a2eb57beaa36ab0835 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Tue, 18 Oct 2022 21:51:56 +0530 Subject: [PATCH 3/7] =?UTF-8?q?=E2=9C=A8=20Rip=20x86=5F64,=20x86,=20armeab?= =?UTF-8?q?i-v7a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/parser.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/parser.py b/src/parser.py index 250b975..1dedf6a 100644 --- a/src/parser.py +++ b/src/parser.py @@ -105,6 +105,10 @@ class Parser(object): args.extend(self._PATCHES) args.append("--rip-lib") args.append("armeabi-v7a") + args.append("--rip-lib") + args.append("x86") + args.append("--rip-lib") + args.append("x86_64") start = perf_counter() process = Popen(["java", *args], stdout=PIPE) From 5488f8d0d839f23c7ed1bece885cd2590275a539 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Tue, 18 Oct 2022 22:18:48 +0530 Subject: [PATCH 4/7] =?UTF-8?q?=E2=9C=A8=20Download=20normal=20cli=20revan?= =?UTF-8?q?ced?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/downloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/downloader.py b/src/downloader.py index 31b54a5..b28aa03 100644 --- a/src/downloader.py +++ b/src/downloader.py @@ -165,7 +165,7 @@ class Downloader(object): def download_revanced(self) -> None: """Download Revanced and Extended Patches, Integration and CLI.""" assets = [ - ["j-hc", "revanced-cli", self.config.normal_cli_jar], + ["revanced", "revanced-cli", self.config.normal_cli_jar], ["revanced", "revanced-integrations", self.config.normal_integrations_apk], ["revanced", "revanced-patches", self.config.normal_patches_jar], ] From f217c514a7a01527c1092f7dd02b48b1d61e5a4d Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Tue, 18 Oct 2022 22:22:30 +0530 Subject: [PATCH 5/7] =?UTF-8?q?=E2=9C=A8=20Option=20to=20build=20only=20ar?= =?UTF-8?q?m64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config.py | 1 + src/parser.py | 1 + 2 files changed, 2 insertions(+) diff --git a/src/config.py b/src/config.py index 6bac9f2..8f37433 100644 --- a/src/config.py +++ b/src/config.py @@ -61,3 +61,4 @@ class RevancedConfig: "BRANDING_PATCH", "custom-branding-icon-blue" if self.build_extended else "custom-branding", ) + self.build_arm64_v8a_only = env.bool("BUILD_ARM64_V8A_ONLY", False) diff --git a/src/parser.py b/src/parser.py index 1dedf6a..64d1406 100644 --- a/src/parser.py +++ b/src/parser.py @@ -103,6 +103,7 @@ class Parser(object): if self._PATCHES: args.extend(self._PATCHES) + if self.config.build_extended and self.config.build_arm64_v8a_only: args.append("--rip-lib") args.append("armeabi-v7a") args.append("--rip-lib") From 2fed2a2bb9bff5f82c946db232ee63f5d4c39631 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Tue, 18 Oct 2022 22:31:38 +0530 Subject: [PATCH 6/7] =?UTF-8?q?=E2=9C=A8=20Updated=20docs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c871546..b411bde 100644 --- a/README.md +++ b/README.md @@ -249,8 +249,13 @@ By default, script build the version as recommended by Revanced team. ```dotenv BRANDING_PATCH=custom-branding-icon-blue ``` - -12. Sample Envs ![envs] +12. You can build only for `arm64-v8a` devices in order to get smaller apk files.This can be done with by adding + `BUILD_ARM64_V8A_ONLY` in `ENVS` in `GitHub secrets` (Recommended) in the format. + ```dotenv + BUILD_ARM64_V8A_ONLY=True + ``` + Make sure you are using `revanced-extended` as `revanced` doesn't support this. +13. Sample Envs ![envs] ### Generate Token 1. Go to your account developer [settings](https://github.com/settings/tokens). Click on generate new token.
From ba506b466db754cc9aa9593bd8fd4ece8955f463 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Tue, 18 Oct 2022 22:46:31 +0530 Subject: [PATCH 7/7] =?UTF-8?q?=E2=9C=A8=20Expect=20files=20during=20PR=20?= =?UTF-8?q?checks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-artifact.yml | 8 +++++++- .github/workflows/pr-checks.yml | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml index bf18a1b..857e0eb 100644 --- a/.github/workflows/build-artifact.yml +++ b/.github/workflows/build-artifact.yml @@ -8,6 +8,11 @@ on: secrets: ENVS: required: false + inputs: + FILES_TO_EXPECT: + type: string + required: false + default: -1 jobs: build-apk: @@ -28,10 +33,11 @@ jobs: docker-compose up - name: Upload Build APKS - uses: actions/upload-artifact@v3.1.0 + uses: nikhilbadyal/upload-artifact@count-check with: name: Built-APKs path: | apks/*-output.apk apks/VancedMicroG.apk" if-no-files-found: error + files-to-expect: ${{ inputs.FILES_TO_EXPECT }} diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 49291a0..d749f31 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -14,6 +14,8 @@ jobs: PYTHON_VERSION: '3.10' build-apk-pr-check: uses: ./.github/workflows/build-artifact.yml + with: + FILES_TO_EXPECT: 2 secrets: ENVS: | PATCH_APPS=youtube