From 822654d802851fd6c60ddca99975998929130b7c Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Thu, 13 Oct 2022 22:43:14 +0530 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=91=B7=20Version=20Bump?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-artifact.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/pr-checks.yml | 3 +++ .github/workflows/pre-commit.yml | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml index d5e1012..a8a6fed 100644 --- a/.github/workflows/build-artifact.yml +++ b/.github/workflows/build-artifact.yml @@ -16,18 +16,18 @@ jobs: steps: - name: Check out Git repository - uses: actions/checkout@v3 + uses: actions/checkout@v3.1.0 - name: Update Env for custom build run: | - echo "${{ secrets.ENVS }}" >> .env + echo "${{ secrets.ENVS }}" > .env - name: Build Revanced APKs run: | docker-compose up - name: Upload Build APKS - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v3.1.0 with: name: Built-APKs path: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 76d042c..cca2da3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v3.1.0 - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 3373f30..537314f 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v3.1.0 - name: Setup Python uses: actions/setup-python@v4.3.0 diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index bd8ae7d..71238c6 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -12,3 +12,6 @@ jobs: uses: ./.github/workflows/linter.yml build-apk-pr-check: uses: ./.github/workflows/build-artifact.yml + secrets: + ENVS: "" + diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index fc2d5a9..bba5ff7 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v3.1.0 - name: Setup Python uses: actions/setup-python@v4.3.0 @@ -29,7 +29,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v4.1.3 with: token: ${{ secrets.GH_TOKEN }} branch: update/pre-commit-autoupdate From afd039725bdf255c332385cddff01dfbccc48e24 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Thu, 13 Oct 2022 22:52:49 +0530 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=91=B7=20Lint=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-checks.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 71238c6..dd44ee6 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -14,4 +14,3 @@ jobs: uses: ./.github/workflows/build-artifact.yml secrets: ENVS: "" - From 73097dd19af86814ec045f9fd20f789b2d8501aa Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Thu, 13 Oct 2022 22:55:04 +0530 Subject: [PATCH 3/4] =?UTF-8?q?=E2=9C=A8=20Don't=20download=20microg=20if?= =?UTF-8?q?=20YouTube=20or=20yt-music=20is=20not=20there?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/downloader.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/downloader.py b/src/downloader.py index bfd5a6b..b28aa03 100644 --- a/src/downloader.py +++ b/src/downloader.py @@ -18,7 +18,7 @@ class Downloader(object): """Files downloader.""" def __init__(self, config: RevancedConfig): - self._CHUNK_SIZE = 2**21 * 5 + self._CHUNK_SIZE = 10485760 self._QUEUE: PriorityQueue[Tuple[float, str]] = PriorityQueue() self._QUEUE_LENGTH = 0 self.config = config @@ -168,7 +168,6 @@ class Downloader(object): ["revanced", "revanced-cli", self.config.normal_cli_jar], ["revanced", "revanced-integrations", self.config.normal_integrations_apk], ["revanced", "revanced-patches", self.config.normal_patches_jar], - ["inotia00", "VancedMicroG", "VancedMicroG-output.apk"], ] if self.config.build_extended: assets += [ @@ -176,6 +175,10 @@ class Downloader(object): ["inotia00", "revanced-integrations", self.config.integrations_apk], ["inotia00", "revanced-patches", self.config.patches_jar], ] + if "youtube" in self.config.apps or "youtube_music" in self.config.apps: + assets += [ + ["inotia00", "VancedMicroG", "VancedMicroG-output.apk"], + ] with ThreadPoolExecutor(7) as executor: executor.map(lambda repo: self.repository(*repo), assets) logger.info("Downloaded revanced microG ,cli, integrations and patches.") From 5f1a54e9c51256d9605377774abc8c996875e501 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Thu, 13 Oct 2022 22:55:18 +0530 Subject: [PATCH 4/4] =?UTF-8?q?=E2=9C=A8=20Increased=20Timeout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-artifact.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml index a8a6fed..72cb232 100644 --- a/.github/workflows/build-artifact.yml +++ b/.github/workflows/build-artifact.yml @@ -12,7 +12,7 @@ jobs: build-apk: name: APK Build runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 steps: - name: Check out Git repository