diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index f7633f7..bc7c2ee 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -37,20 +37,20 @@ jobs: echo "REPO=${{ github.repository_owner }}/aniyomi-extensions" >> $GITHUB_ENV - name: Clone Repository (Latest) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.REPO }} fetch-depth: 0 ref: ${{ github.event.inputs.git-ref }} - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: zulu - name: Generate multisrc sources - uses: gradle/gradle-command-action@v2 + uses: gradle/gradle-build-action@v2 with: arguments: :multisrc:generateExtensions @@ -59,8 +59,8 @@ jobs: set -x ./gradlew -q projects | grep '.*extensions\:\(individual\|multisrc\)\:.*\:.*' > projects.txt - echo "NUM_INDIVIDUAL_MODULES=$(cat projects.txt | grep '.*\:individual\:.*' | wc -l)" >> $GITHUB_ENV - echo "NUM_MULTISRC_MODULES=$(cat projects.txt | grep '.*\:multisrc\:.*' | wc -l)" >> $GITHUB_ENV + echo "NUM_INDIVIDUAL_MODULES=$(grep -c '.*\:individual\:.*' projects.txt)" >> $GITHUB_ENV + echo "NUM_MULTISRC_MODULES=$(grep -c '.*\:multisrc\:.*' projects.txt)" >> $GITHUB_ENV - id: generate-matrices name: Create output matrices @@ -95,27 +95,27 @@ jobs: echo "REPO=${{ github.repository_owner }}/aniyomi-extensions" >> $GITHUB_ENV - name: Clone Repository (Latest) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.REPO }} fetch-depth: 0 ref: ${{ github.event.inputs.git-ref }} - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: zulu - name: Generate sources from the multi-source library - uses: gradle/gradle-command-action@v2.3.3 + uses: gradle/gradle-build-action@v2 env: CI_MODULE_GEN: "true" with: arguments: :multisrc:generateExtensions - name: Build extensions (chunk ${{ matrix.chunk }}) - uses: gradle/gradle-command-action@v2 + uses: gradle/gradle-build-action@v2 env: CI_MULTISRC: "true" CI_CHUNK_NUM: ${{ matrix.chunk }} @@ -143,20 +143,20 @@ jobs: echo "REPO=${{ github.repository_owner }}/aniyomi-extensions" >> $GITHUB_ENV - name: Clone Repository (Latest) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.REPO }} fetch-depth: 0 ref: ${{ github.event.inputs.git-ref }} - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: zulu - name: Build extensions (chunk ${{ matrix.chunk }}) - uses: gradle/gradle-command-action@v2.3.3 + uses: gradle/gradle-build-action@v2 env: CI_MULTISRC: "false" CI_CHUNK_NUM: ${{ matrix.chunk }} diff --git a/.github/workflows/build_single_extension.yml b/.github/workflows/build_single_extension.yml index 67213d8..e8ca554 100644 --- a/.github/workflows/build_single_extension.yml +++ b/.github/workflows/build_single_extension.yml @@ -47,33 +47,31 @@ jobs: echo "BASESLUG=multisrc" >> $GITHUB_ENV fi - name: Clone Repository (Latest) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.REPO }} fetch-depth: 0 ref: ${{ github.event.inputs.git-ref }} - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: zulu - name: Generate multisrc extensions if: ${{ github.event.inputs.ismultisrc == 'true' }} - uses: gradle/gradle-build-action@v2.3.3 + uses: gradle/gradle-build-action@v2 with: arguments: :multisrc:generateExtensions - gradle-home-cache-cleanup: true - name: Build APK - uses: gradle/gradle-build-action@v2.3.3 + uses: gradle/gradle-build-action@v2 with: arguments: :extensions:${{ env.BASESLUG }}:${{ env.EXTSLUG }}:assembleDebug - gradle-home-cache-cleanup: true - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{github.event.inputs.lang}}-${{ github.event.inputs.extension }} path: "${{ env.BASEPATH }}/${{ env.EXTPATH }}/build/outputs/apk/debug/*.apk"