From 53c255d1881dba83ace4ed2900ab5ccde256fbed Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Sat, 22 Oct 2022 19:32:15 +0530 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=91=B7=20Use=20default=20GitHub=20Sec?= =?UTF-8?q?ret?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-apk.yml | 8 ++++---- .github/workflows/dockerhub.yml | 2 +- .github/workflows/github-cleanup.yml | 2 +- .github/workflows/pre-commit.yml | 2 +- .github/workflows/virus-total-scan.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-apk.yml b/.github/workflows/build-apk.yml index 7dbd8bc..adbee84 100644 --- a/.github/workflows/build-apk.yml +++ b/.github/workflows/build-apk.yml @@ -56,14 +56,14 @@ jobs: - name: Delete Older Releases uses: nikhilbadyal/ghaction-rm-releases@v0.0.1 with: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} RELEASE_PATTERN: 'Build*' - name: Upload Build Artifact uses: ncipollo/release-action@v1.11.1 with: artifacts: "*-output.apk" - token: ${{ secrets.GH_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} tag: Build-${{ steps.get-date.outputs.date }} artifactErrorsFailBuild: true generateReleaseNotes: true @@ -81,7 +81,7 @@ jobs: if: ${{ inputs.VIRUSTOTAL_SCAN }} secrets: VT_API_KEY: ${{ secrets.VT_API_KEY }} - GH_TOKEN: ${{ secrets.GH_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} upload-to-telegram: needs: [ upload-to-github ] @@ -120,4 +120,4 @@ jobs: needs: [ upload-to-telegram ] uses: ./.github/workflows/github-cleanup.yml secrets: - GH_TOKEN: ${{ secrets.GH_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index bfb9e73..cf7583b 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -18,4 +18,4 @@ jobs: name: GitHub Cleanup uses: nikhilbadyal/ghactions/.github/workflows/github-cleanup.yml@main secrets: - GH_TOKEN: ${{ secrets.GH_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/github-cleanup.yml b/.github/workflows/github-cleanup.yml index 82eef53..4df49e9 100644 --- a/.github/workflows/github-cleanup.yml +++ b/.github/workflows/github-cleanup.yml @@ -12,4 +12,4 @@ jobs: name: GitHub Cleanup uses: nikhilbadyal/ghactions/.github/workflows/github-cleanup.yml@main secrets: - GH_TOKEN: ${{ secrets.GH_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 2cd55bb..bb10a66 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,6 +13,6 @@ jobs: uses: nikhilbadyal/ghactions/.github/workflows/python-precommit-updater.yml@main if: github.repository == 'nikhilbadyal/docker-py-revanced' secrets: - GH_TOKEN: ${{ secrets.GH_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: PYTHON_VERSION: '3.10' diff --git a/.github/workflows/virus-total-scan.yml b/.github/workflows/virus-total-scan.yml index 0628f32..84c8709 100644 --- a/.github/workflows/virus-total-scan.yml +++ b/.github/workflows/virus-total-scan.yml @@ -20,7 +20,7 @@ jobs: with: vt_api_key: ${{ secrets.VT_API_KEY }} update_release_body: true - github_token: ${{ secrets.GH_TOKEN }} + github_token: ${{ secrets.GITHUB_TOKEN }} request_rate: 4 files: | .apk$ From c3193e90517d626baca9ccb75ad56ecdd1d870eb Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Sat, 22 Oct 2022 19:51:31 +0530 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9D=20No=20need=20of=20GH=5FTOKEN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index e024982..4e7b2b9 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,8 @@ You can use any of the following methods to build. - 🚀In GitHub (**_`Recommended`_**) 1. Fork the project. - ![image](https://user-images.githubusercontent.com/22337329/186554644-7d4c2172-c0dd-4ea6-9ec1-08e9b567a5e3.png) - 2. Add following secrets to the repo. - 1. _GH_TOKEN_ (**required**) - GitHub token so that it can upload to GitHub - after building. Click [here](#generate-token) to learn how to get that. - 2. _VT_API_KEY_ (optional) - required only if you want Virus total scan. - 3. _ENVS_ (optional) - required only if you want to cook specific apps/versions. + ![fork] + 2. Add `ENVS` (**optional**) secret to the repo. Required only if you want to cook specific apps/versions.
🚶Detailed step by step guide @@ -31,8 +27,7 @@ You can use any of the following methods to build.
- 3. Go to actions tab. Select `Build Revanced APK`.Click on `Run Workflow`. - 1. It can take a few minute to start. Just be patient. + 3. Go to actions tab. Select `Build & Release`.Click on `Run Workflow`.
🚶Detailed step by step guide @@ -40,16 +35,11 @@ You can use any of the following methods to build. - Go to actions tab ![action_0] - Check the status of build, It should look green. - ![action_1] - - Check logs if something fails. - ![action_2] - ![action_3] + ![build_wait]
- 4. If the building process is successful, you’ll get your APKs in the releases - - ![apks] - 5. Click on **`Build-`** and download the apk file. + 4. If the building process is successful, you’ll get your APKs in the ![apks]
@@ -253,21 +243,21 @@ By default, script build the version as recommended by Revanced team. ``` Possible values for `ARCHS_TO_BUILD` are: `armeabi-v7a`,`x86`,`x86_64`,`arm64-v8a` Make sure you are using `revanced-extended` as `revanced` doesn't support this. -13. Sample Envs ![envs] +13. You can scan your build apks files with VirusTotal. For that, Add `VT_API_KEY` in `GitHub secrets`. +14. Sample Envs ![envs] ### Generate Token 1. Go to your account developer [settings](https://github.com/settings/tokens). Click on generate new token.
2. Give a nice name. and grant following permissions
- + +[fork]: https://i.imgur.com/R5HdByI.png [secrets]: https://i.imgur.com/083Bjpg.png [step_1]: https://i.imgur.com/Inj82KK.png -[step_2]: https://user-images.githubusercontent.com/22337329/186521861-42786e8d-5db4-43ef-9676-2f7e7c0eddc4.png -[action_0]: https://i.imgur.com/M1XdjZC.png -[action_1]: https://user-images.githubusercontent.com/22337329/186533319-0aebf294-9bac-4859-b4e1-1b4c87d39f48.png -[action_2]: https://user-images.githubusercontent.com/22337329/186533358-e27e30bc-0d16-4f56-a335-0387c481dbf8.png -[action_3]: https://user-images.githubusercontent.com/22337329/186533417-15477a2c-28c3-4e39-9f3d-c4e18202d000.png +[step_2]: https://i.imgur.com/V2Wfx3J.png +[action_0]: https://i.imgur.com/XSCvzav.png +[build_wait]: https://i.imgur.com/CsJt9W1.png [apks]: https://i.imgur.com/S5d7qAO.png [chat id]: https://i.imgur.com/22UiaWs.png [bot api]: https://i.imgur.com/A6JCyK2.png From c260ad426aef275a81e0a21b0c2d358b5f1613ad Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Sat, 22 Oct 2022 20:42:04 +0530 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=9D=20Updated=20envs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ------ export_env.sh | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4e7b2b9..7c22698 100644 --- a/README.md +++ b/README.md @@ -246,12 +246,6 @@ By default, script build the version as recommended by Revanced team. 13. You can scan your build apks files with VirusTotal. For that, Add `VT_API_KEY` in `GitHub secrets`. 14. Sample Envs ![envs] -### Generate Token -1. Go to your account developer [settings](https://github.com/settings/tokens). Click on generate new token.
- -2. Give a nice name. and grant following permissions
- - [fork]: https://i.imgur.com/R5HdByI.png [secrets]: https://i.imgur.com/083Bjpg.png [step_1]: https://i.imgur.com/Inj82KK.png diff --git a/export_env.sh b/export_env.sh index 6c303f0..d24a547 100644 --- a/export_env.sh +++ b/export_env.sh @@ -7,6 +7,6 @@ set -o nounset export PATCH_APPS=youtube,twitter,reddit,youtube_music export BUILD_EXTENDED=True export EXCLUDE_PATCH_YOUTUBE=custom-branding,enable-debugging -export EXCLUDE_PATCH_YOUTUBE_EXTENDED=custom-branding-icon-red,custom-branding-icon-blue,custom-branding-icon-revancify,custom-branding-name,custom-package-name,materialyou -export EXCLUDE_PATCH_YOUTUBE_MUSIC_EXTENDED=custom-branding-music-red,custom-branding-music-revancify,custom-package-name-music,compact-header +export EXCLUDE_PATCH_YOUTUBE_EXTENDED=custom-branding-icon-red,custom-branding-icon-blue,custom-branding-icon-revancify,custom-branding-name,custom-package-name,materialyou,website +export EXCLUDE_PATCH_YOUTUBE_MUSIC_EXTENDED=custom-branding-music-red,custom-branding-music-revancify,custom-package-name-music,compact-header,website-music export ARCHS_TO_BUILD=arm64-v8a