From 12ba4a6271e3bb8007f2130c32c708f8c828100e Mon Sep 17 00:00:00 2001 From: Fioren <102145692+FiorenMas@users.noreply.github.com> Date: Wed, 30 Oct 2024 01:54:54 +0700 Subject: [PATCH] remove bilibili Because it closed source, can't self patch anymore Update workflow Change CI to detect new patch file format (.rvp) --- .github/actions/preparing/action.yml | 2 +- .github/workflows/ci.yml | 12 +---- .github/workflows/manual-patch.yml | 48 +++++-------------- README.md | 37 -------------- src/build/BiliRoamingX.sh | 16 ------- src/build/Piko.sh | 2 +- src/etc/ci.sh | 4 +- src/options/BiliRoamingX.json | 1 - .../bilibili-BiliRoamingX/exclude-patches | 0 .../bilibili-BiliRoamingX/include-patches | 0 10 files changed, 17 insertions(+), 105 deletions(-) delete mode 100644 src/build/BiliRoamingX.sh delete mode 100644 src/options/BiliRoamingX.json delete mode 100644 src/patches/bilibili-BiliRoamingX/exclude-patches delete mode 100644 src/patches/bilibili-BiliRoamingX/include-patches diff --git a/.github/actions/preparing/action.yml b/.github/actions/preparing/action.yml index 7da3f7e..48e9459 100644 --- a/.github/actions/preparing/action.yml +++ b/.github/actions/preparing/action.yml @@ -3,7 +3,7 @@ runs: using: "composite" steps: - name: Set up jdk - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4.5.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 259e0d7..b90de2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,9 +65,6 @@ jobs: id: check-rve5 if: steps.check-gh.outputs.internet_error == '0' run: bash src/etc/ci.sh d4n3436/revanced-patches-android5 latest youtube-revanced-extended-android-5.apk - - name: Check new patch BiliRoamingX - id: check-BiliRoamingX - if: steps.check-gh.outputs.internet_error == '0' run: bash src/etc/ci.sh BiliRoamingX/BiliRoamingX latest bilibili-BiliRoamingX.apk - name: Keep workflow run if: steps.check-gh.outputs.internet_error == '0' @@ -185,11 +182,4 @@ jobs: if: ${{ needs.check.outputs.check_rve5 == 1 }} uses: ./.github/workflows/manual-patch.yml with: - org: "Revanced Extended Android 5" - Patch-BiliRoamingX: - name: Patch BiliRoamingX - needs: check - if: ${{ needs.check.outputs.check_BiliRoamingX == 1 }} - uses: ./.github/workflows/manual-patch.yml - with: - org: "BiliRoamingX" + org: "Revanced Extended Android 5" \ No newline at end of file diff --git a/.github/workflows/manual-patch.yml b/.github/workflows/manual-patch.yml index a95bacb..b9d8811 100644 --- a/.github/workflows/manual-patch.yml +++ b/.github/workflows/manual-patch.yml @@ -27,7 +27,6 @@ on: - 'Twitter Piko Beta' - 'Revanced Extended Android 6,7' - 'Revanced Extended Android 5' - - 'BiliRoamingX' - 'Dropped Patches - indrastorms' retry_count: description: 'Do not change value below' @@ -48,7 +47,7 @@ jobs: run: [1, 2, 3, 4, 5, 6, 7, 8, 9] steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -74,7 +73,7 @@ jobs: run: [1, 2, 3, 4, 5, 6, 7, 8, 9] steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -100,7 +99,7 @@ jobs: run: [1, 2, 3] steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -126,7 +125,7 @@ jobs: run: [1, 2, 3] steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -152,7 +151,7 @@ jobs: run: [1, 2, 3] steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -178,7 +177,7 @@ jobs: run: [1, 2, 3] steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -201,7 +200,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -224,7 +223,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -247,7 +246,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -270,7 +269,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -293,7 +292,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection @@ -310,36 +309,13 @@ jobs: - name: Re-run workflow if github connection not stable if: always() && steps.patch-rve5.outcome == 'skipped' || steps.release-rve5.outcome == 'skipped' && env.retry_count < env.max_retries uses: ./.github/actions/re-run - patch_BiliRoamingX: - name: Patch BiliRoamingX - if: ${{ github.event.inputs.org == 'BiliRoamingX' || inputs.org == 'BiliRoamingX' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - name: Preparing to patch - uses: ./.github/actions/preparing - - name: Check github connection - id: check-gh-BiliRoamingX - run: bash src/etc/connection.sh - - name: Patch apk - id: patch-BiliRoamingX - if: steps.check-gh-BiliRoamingX.outputs.internet_error == '0' - run: bash src/build/BiliRoamingX.sh - - name: Releasing APK files - id: release-BiliRoamingX - if: steps.check-gh-BiliRoamingX.outputs.internet_error == '0' - uses: ./.github/actions/release - - name: Re-run workflow if github connection not stable - if: always() && steps.patch-BiliRoamingX.outcome == 'skipped' || steps.release-BiliRoamingX.outcome == 'skipped' && env.retry_count < env.max_retries - uses: ./.github/actions/re-run patch_Dropped_Patches: name: Dropped Patches Revanced - indrastorms if: ${{ github.event.inputs.org == 'Dropped Patches - indrastorms' || inputs.org == 'Dropped Patches - indrastorms' }} runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.2.2 - name: Preparing to patch uses: ./.github/actions/preparing - name: Check github connection diff --git a/README.md b/README.md index 934cb4f..77df64e 100644 --- a/README.md +++ b/README.md @@ -287,14 +287,6 @@ Download --- -### [Bilbili: (Chinese only)](https://play.google.com/store/apps/details?id=com.bilibili.app.in) - -### [BiliRoamingX:](https://github.com/BiliRoamingX/BiliRoamingX) - -[All Architectures](../../releases/download/all/bilibili-BiliRoamingX.apk ) - ---- - ### [Nova Launcher:](https://play.google.com/store/apps/details?id=com.teslacoilsw.launcher) ### [Dropped Patches by indrastorms:](https://github.com/indrastorms/Dropped-Patches) @@ -387,35 +379,6 @@ Download - - -
- YT-Advanced - -[Patches](https://github.com/YT-Advanced/ReX-patches) - [GPL-3.0](https://github.com/YT-Advanced/ReX-patches/blob/master/LICENSE) - -[Integrations](https://github.com/YT-Advanced/ReX-integrations) - [GPL-3.0](https://github.com/YT-Advanced/ReX-integrations/blob/main/LICENSE) - -
- -
- rufusin - -[Patches](https://github.com/rufusin/revanced-patches) - [GPL-3.0](https://github.com/rufusin/revanced-patches/blob/main/LICENSE) - -[Integrations](https://github.com/rufusin/revanced-integrations) - [GPL-3.0](https://github.com/rufusin/revanced-integrations/blob/main/LICENSE) - -
- -
- BiliRoamingX - -[Patches, Integrations](https://github.com/BiliRoamingX/BiliRoamingX) - [GPL-3.0](https://github.com/BiliRoamingX/BiliRoamingX/blob/main/LICENSE) - -
- - -
indrastorms diff --git a/src/build/BiliRoamingX.sh b/src/build/BiliRoamingX.sh deleted file mode 100644 index ff2be64..0000000 --- a/src/build/BiliRoamingX.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# BiliRoamingX build for chinese only -source ./src/build/utils.sh - -################################################# - -# Download requirements -dl_gh "revanced-cli" "revanced" "latest" -dl_gh "BiliRoamingX" "BiliRoamingX" "latest" - -################################################# - -# Patch bilibili: -get_patches_key "bilibili-BiliRoamingX" -get_apk "com.bilibili.app.in" "bilibili" "bilibili" "bilibili/bilibili/bilibili" -patch "bilibili" "BiliRoamingX" \ No newline at end of file diff --git a/src/build/Piko.sh b/src/build/Piko.sh index f292b3d..4984da4 100644 --- a/src/build/Piko.sh +++ b/src/build/Piko.sh @@ -4,7 +4,7 @@ source src/build/utils.sh # Patch Twitter Piko: patch_piko () { - dl_gh "revanced-cli" "revanced" "latest" + dl_gh "revanced-cli" "revanced" "v4.6.0" get_patches_key "twitter-piko" local v apk_name if [[ "$1" == "latest" ]]; then diff --git a/src/etc/ci.sh b/src/etc/ci.sh index 582b29c..92cc1be 100644 --- a/src/etc/ci.sh +++ b/src/etc/ci.sh @@ -19,7 +19,7 @@ get_date() { checker(){ local date1 date2 date1_sec date1_sec repo=$1 ur_repo=$repository check=$3 - date1=$(get_date "$repo" "$2" "^.*\\\.jar$") + date1=$(get_date "$repo" "$2" "^(.*\\\.jar|.*\\\.rvp)$") date2=$(get_date "$ur_repo" "all" "$check") date1_sec=$(date -d "$date1" +%s) date2_sec=$(date -d "$date2" +%s) @@ -31,4 +31,4 @@ checker(){ echo -e "\e[32mOld patch, not build.\e[0m" fi } -checker $1 $2 $3 +checker $1 $2 $3 \ No newline at end of file diff --git a/src/options/BiliRoamingX.json b/src/options/BiliRoamingX.json deleted file mode 100644 index 0637a08..0000000 --- a/src/options/BiliRoamingX.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/src/patches/bilibili-BiliRoamingX/exclude-patches b/src/patches/bilibili-BiliRoamingX/exclude-patches deleted file mode 100644 index e69de29..0000000 diff --git a/src/patches/bilibili-BiliRoamingX/include-patches b/src/patches/bilibili-BiliRoamingX/include-patches deleted file mode 100644 index e69de29..0000000