diff --git a/.github/actions/preparing/action.yml b/.github/actions/preparing/action.yml new file mode 100644 index 0000000..95c3236 --- /dev/null +++ b/.github/actions/preparing/action.yml @@ -0,0 +1,12 @@ +name: Preparing to patch +runs: + using: "composite" + steps: + - name: Set up jdk + uses: actions/setup-java@v4.0.0 + with: + distribution: 'zulu' + java-version: '17' + - name: Setup Cloudflare Warp + shell: bash + run: bash src/etc/cf_warp.sh diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml new file mode 100644 index 0000000..a4a255c --- /dev/null +++ b/.github/actions/release/action.yml @@ -0,0 +1,21 @@ +name: Releasing APK files +runs: + using: "composite" + steps: + - name: Generate release info + shell: bash + 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: | + ./release/* + name: Revanced & Revanced Extended + tag_name: all + body_path: ${{ github.workspace }}-CHANGELOG.txt \ No newline at end of file diff --git a/.github/workflows/Fix-Readme.yml b/.github/workflows/Fix-Readme.yml index aae07e1..23f9ff2 100644 --- a/.github/workflows/Fix-Readme.yml +++ b/.github/workflows/Fix-Readme.yml @@ -6,12 +6,12 @@ jobs: runs-on: ubuntu-latest permissions: write-all steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v4.1.1 - name: Edit Readme run: | curl -o README.md https://raw.githubusercontent.com/${{ github.repository }}/main/README.md sed -i "s#FiorenMas/Revanced-And-Revanced-Extended-Non-Root#${{ github.repository }}#g" README.md - - name: Commit Readme uses: EndBug/add-and-commit@v9.1.1 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ea731b..40375f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,94 +4,63 @@ on: - cron: "0 */6 * * *" workflow_dispatch: jobs: - check-rv: - name: Check new patch Revanced + check: + name: Check new patch permissions: write-all runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - + - name: Checkout + uses: actions/checkout@v4.1.1 - name: Check new patch ReVanced id: check-rv run: bash src/etc/ci.sh ReVanced/revanced-patches youtube-revanced.apk env: repository: ${{ github.repository }} - - outputs: - check_rv: ${{ steps.check-rv.outputs.new_patch }} - - check-rve: - name: Check new patch Revanced Extended - permissions: write-all - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Check new patch Revanced Extended id: check-rve run: bash src/etc/ci.sh inotia00/revanced-patches youtube-revanced-extended.apk env: repository: ${{ github.repository }} - - outputs: - check_rve: ${{ steps.check-rve.outputs.new_patch }} - - check-rve67: - name: Check new patch Revanced For Android 6 & 7 - permissions: write-all - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Check new patch Revanced For Android 6 & 7 id: check-rve67 run: bash src/etc/ci.sh kitadai31/revanced-patches-android6-7 youtube-revanced-extended-android-6-7.apk env: repository: ${{ github.repository }} - - outputs: - check_rve67: ${{ steps.check-rve67.outputs.new_patch }} - - check-rve5: - name: Check new patch Revanced For Android 5 - permissions: write-all - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Check new patch Revanced For Android 5 id: check-rve5 run: bash src/etc/ci.sh d4n3436/revanced-patches-android5 youtube-revanced-extended-android-5.apk env: repository: ${{ github.repository }} - outputs: + check_rv: ${{ steps.check-rv.outputs.new_patch }} + check_rve: ${{ steps.check-rve.outputs.new_patch }} + check_rve67: ${{ steps.check-rve67.outputs.new_patch }} check_rve5: ${{ steps.check-rve5.outputs.new_patch }} Patch-Revanced: name: Patch Revanced permissions: write-all - needs: check-rv + needs: check uses: ./.github/workflows/patch-revanced.yml - if: ${{ needs.check-rv.outputs.check_rv == 1 }} + if: ${{ needs.check.outputs.check_rv == 1 }} Patch-Revanced-Extended: name: Patch Revanced Extended permissions: write-all - needs: check-rve + needs: check uses: ./.github/workflows/patch-revanced-extended.yml - if: ${{ needs.check-rve.outputs.check_rve == 1 }} + if: ${{ needs.check.outputs.check_rve == 1 }} Patch-Revanced-Extended-For-Android-6-7: name: Patch Revanced Extended For Android 6 & 7 permissions: write-all - needs: check-rve67 + needs: check uses: ./.github/workflows/patch-revanced-extended-android-6-7.yml - if: ${{ needs.check-rve67.outputs.check_rve67 == 1 }} + if: ${{ needs.check.outputs.check_rve67 == 1 }} Patch-Revanced-Extended-For-Android-5: name: Patch Revanced Extended For Android 5 permissions: write-all - needs: check-rve5 + needs: check uses: ./.github/workflows/patch-revanced-extended-android-5.yml - if: ${{ needs.check-rve5.outputs.check_rve5 == 1 }} + if: ${{ needs.check.outputs.check_rve5 == 1 }} diff --git a/.github/workflows/patch-revanced-extended-android-5.yml b/.github/workflows/patch-revanced-extended-android-5.yml index 1c27fbc..3a954c1 100644 --- a/.github/workflows/patch-revanced-extended-android-5.yml +++ b/.github/workflows/patch-revanced-extended-android-5.yml @@ -8,36 +8,13 @@ jobs: 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: Setup Cloudflare Warp - run: bash src/etc/cf_warp.sh - + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: Preparing to patch + uses: ./.github/actions/preparing - name: Patch apk run: bash src/build/Revanced-Extended-Android-5.sh env: repository: ${{ github.repository }} - - - 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: | - ./release/* - name: Revanced & Revanced Extended - tag_name: all - body_path: ${{ github.workspace }}-CHANGELOG.txt \ No newline at end of file + - name: Releasing APK files + uses: ./.github/actions/release \ No newline at end of file diff --git a/.github/workflows/patch-revanced-extended-android-6-7.yml b/.github/workflows/patch-revanced-extended-android-6-7.yml index e5320a6..d674455 100644 --- a/.github/workflows/patch-revanced-extended-android-6-7.yml +++ b/.github/workflows/patch-revanced-extended-android-6-7.yml @@ -8,36 +8,13 @@ jobs: 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: Setup Cloudflare Warp - run: bash src/etc/cf_warp.sh - + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: Preparing to patch + uses: ./.github/actions/preparing - name: Patch apk run: bash src/build/Revanced-Extended-Android-6-7.sh env: repository: ${{ github.repository }} - - - 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: | - ./release/* - name: Revanced & Revanced Extended - tag_name: all - body_path: ${{ github.workspace }}-CHANGELOG.txt \ No newline at end of file + - name: Releasing APK files + uses: ./.github/actions/release \ No newline at end of file diff --git a/.github/workflows/patch-revanced-extended.yml b/.github/workflows/patch-revanced-extended.yml index 5c86283..6d6aec4 100644 --- a/.github/workflows/patch-revanced-extended.yml +++ b/.github/workflows/patch-revanced-extended.yml @@ -8,36 +8,13 @@ jobs: 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: Setup Cloudflare Warp - run: bash src/etc/cf_warp.sh - + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: Preparing to patch + uses: ./.github/actions/preparing - name: Patch apk run: bash src/build/Revanced-Extended.sh env: repository: ${{ github.repository }} - - - 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: | - ./release/* - name: Revanced & Revanced Extended - tag_name: all - body_path: ${{ github.workspace }}-CHANGELOG.txt \ No newline at end of file + - name: Releasing APK files + uses: ./.github/actions/release \ No newline at end of file diff --git a/.github/workflows/patch-revanced.yml b/.github/workflows/patch-revanced.yml index d8c4002..5f5f566 100644 --- a/.github/workflows/patch-revanced.yml +++ b/.github/workflows/patch-revanced.yml @@ -3,119 +3,21 @@ on: workflow_dispatch: workflow_call: jobs: - patch1: - name: Patch Revanced-1 + Revanced: + name: Patch Revanced-${{ matrix.Revanced }} permissions: write-all runs-on: ubuntu-latest + strategy: + matrix: + Revanced: [1, 2, 3] steps: - - uses: actions/checkout@v3 - - - name: Set up jdk - uses: actions/setup-java@v3.11.0 - with: - distribution: 'zulu' - java-version: '17' - - - name: Setup Cloudflare Warp - run: bash src/etc/cf_warp.sh - + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: Preparing to patch + uses: ./.github/actions/preparing - name: Patch apk - run: bash src/build/Revanced-1.sh + run: bash src/build/Revanced-${{ matrix.Revanced }}.sh env: repository: ${{ github.repository }} - - - 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: | - ./release/* - name: Revanced & Revanced Extended - tag_name: all - body_path: ${{ github.workspace }}-CHANGELOG.txt - - patch2: - name: Patch Revanced-2 - 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: Setup Cloudflare Warp - run: bash src/etc/cf_warp.sh - - - name: Patch apk - run: bash src/build/Revanced-2.sh - env: - repository: ${{ github.repository }} - - - 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: | - ./release/* - name: Revanced & Revanced Extended - tag_name: all - body_path: ${{ github.workspace }}-CHANGELOG.txt - - patch3: - name: Patch Revanced-3 - 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: Setup Cloudflare Warp - run: bash src/etc/cf_warp.sh - - - name: Patch apk - run: bash src/build/Revanced-3.sh - env: - repository: ${{ github.repository }} - - - 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: | - ./release/* - name: Revanced & Revanced Extended - tag_name: all - body_path: ${{ github.workspace }}-CHANGELOG.txt \ No newline at end of file + - name: Releasing APK files + uses: ./.github/actions/release