diff --git a/.github/workflows/build-manager-ci.yml b/.github/workflows/build-manager-ci.yml index aa0a60ef..3783e19a 100644 --- a/.github/workflows/build-manager-ci.yml +++ b/.github/workflows/build-manager-ci.yml @@ -23,32 +23,18 @@ jobs: # uses: ./.github/workflows/build-lkm.yml # secrets: inherit - build-susfsd-aarch64: + build-susfsd: # needs: build-lkm strategy: matrix: include: - - target: aarch64-linux-android - os: ubuntu-latest - uses: ./.github/workflows/susfsd-aarch64.yml + - os: ubuntu-latest + uses: ./.github/workflows/susfsd.yml with: - target: ${{ matrix.target }} - os: ${{ matrix.os }} - - build-susfsd-arm: - needs: build-susfsd-aarch64 - strategy: - matrix: - include: - - target: armv7-linux-androideabi - os: ubuntu-latest - uses: ./.github/workflows/susfsd-arm.yml - with: - target: ${{ matrix.target }} os: ${{ matrix.os }} build-ksud: - needs: build-susfsd-arm + needs: build-susfsd strategy: matrix: include: @@ -104,16 +90,10 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - - name: Download arm64 susfsd + - name: Download susfsd uses: actions/download-artifact@v4 with: - name: susfsd-aarch64-linux-android - path: . - - - name: Download arm susfsd - uses: actions/download-artifact@v4 - with: - name: susfsd-armv7a-linux-androideabi + name: susfsd-linux-android path: . - name: Copy susfsd to app jniLibs @@ -210,4 +190,4 @@ jobs: APK=$(find ./app/build/outputs/apk/release -name "*.apk") pip3 install telethon python3 $GITHUB_WORKSPACE/scripts/ksunextbot.py $APK - fi \ No newline at end of file + fi diff --git a/.github/workflows/build-manager-spoofed.yml b/.github/workflows/build-manager-spoofed.yml index fe0fca15..82f644e9 100644 --- a/.github/workflows/build-manager-spoofed.yml +++ b/.github/workflows/build-manager-spoofed.yml @@ -25,32 +25,18 @@ jobs: # uses: ./.github/workflows/build-lkm.yml # secrets: inherit - build-susfsd-aarch64: + build-susfsd: # needs: build-lkm strategy: matrix: include: - - target: aarch64-linux-android - os: ubuntu-latest - uses: ./.github/workflows/susfsd-aarch64.yml + - os: ubuntu-latest + uses: ./.github/workflows/susfsd.yml with: - target: ${{ matrix.target }} - os: ${{ matrix.os }} - - build-susfsd-arm: - needs: build-susfsd-aarch64 - strategy: - matrix: - include: - - target: armv7-linux-androideabi - os: ubuntu-latest - uses: ./.github/workflows/susfsd-arm.yml - with: - target: ${{ matrix.target }} os: ${{ matrix.os }} build-ksud: - needs: build-susfsd-arm + needs: build-susfsd strategy: matrix: include: @@ -110,16 +96,11 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - - name: Download arm64 susfsd + + - name: Download susfsd uses: actions/download-artifact@v4 with: - name: susfsd-aarch64-linux-android - path: . - - - name: Download arm susfsd - uses: actions/download-artifact@v4 - with: - name: susfsd-armv7a-linux-androideabi + name: susfsd-linux-android path: . - name: Copy susfsd to app jniLibs @@ -216,4 +197,4 @@ jobs: APK=$(find ./app/build/outputs/apk/release -name "*.apk") pip3 install telethon python3 $GITHUB_WORKSPACE/scripts/ksunextbot.py $APK - fi \ No newline at end of file + fi diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml index 28742c08..c8376b01 100644 --- a/.github/workflows/build-manager.yml +++ b/.github/workflows/build-manager.yml @@ -23,32 +23,18 @@ jobs: # uses: ./.github/workflows/build-lkm.yml # secrets: inherit // DISBAND LKM MODE - build-susfsd-aarch64: + build-susfsd: # needs: build-lkm strategy: matrix: include: - - target: aarch64-linux-android - os: ubuntu-latest - uses: ./.github/workflows/susfsd-aarch64.yml + - os: ubuntu-latest + uses: ./.github/workflows/susfsd.yml with: - target: ${{ matrix.target }} - os: ${{ matrix.os }} - - build-susfsd-arm: - needs: build-susfsd-aarch64 - strategy: - matrix: - include: - - target: armv7-linux-androideabi - os: ubuntu-latest - uses: ./.github/workflows/susfsd-arm.yml - with: - target: ${{ matrix.target }} os: ${{ matrix.os }} build-ksud: - needs: build-susfsd-arm + needs: build-susfsd strategy: matrix: include: @@ -104,16 +90,10 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - - name: Download arm64 susfsd + - name: Download susfsd uses: actions/download-artifact@v4 with: - name: susfsd-aarch64-linux-android - path: . - - - name: Download arm susfsd - uses: actions/download-artifact@v4 - with: - name: susfsd-armv7a-linux-androideabi + name: susfsd-linux-android path: . - name: Copy susfsd to app jniLibs @@ -210,4 +190,4 @@ jobs: APK=$(find ./app/build/outputs/apk/release -name "*.apk") pip3 install telethon python3 $GITHUB_WORKSPACE/scripts/ksunextbot.py $APK - fi \ No newline at end of file + fi diff --git a/.github/workflows/ksud.yml b/.github/workflows/ksud.yml index f2fecba1..41a54856 100644 --- a/.github/workflows/ksud.yml +++ b/.github/workflows/ksud.yml @@ -37,10 +37,10 @@ jobs: - name: Import susfsd Libraries run: | - cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_overlayfs/bin/aarch64/ - cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_magic/bin/aarch64/ - cp susfsd-armv7a-linux-androideabi/armeabi-v7a/susfsd ./userspace/ksud_overlayfs/bin/arm/ - cp susfsd-armv7a-linux-androideabi/armeabi-v7a/susfsd ./userspace/ksud_magic/bin/arm/ + cp susfsd-linux-android/arm64-v8a/susfsd ./userspace/ksud_overlayfs/bin/aarch64/ + cp susfsd-linux-android/arm64-v8a/susfsd ./userspace/ksud_magic/bin/aarch64/ + cp susfsd-linux-android/armeabi-v7a/susfsd ./userspace/ksud_overlayfs/bin/arm/ + cp susfsd-linux-android/armeabi-v7a/susfsd ./userspace/ksud_magic/bin/arm/ - name: Setup Rust run: | @@ -78,4 +78,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: ksud_magic-${{ inputs.target }} - path: userspace/ksud_magic/target/**/release/ksud* \ No newline at end of file + path: userspace/ksud_magic/target/**/release/ksud* diff --git a/.github/workflows/susfsd-arm.yml b/.github/workflows/susfsd-arm.yml deleted file mode 100644 index b1595ff6..00000000 --- a/.github/workflows/susfsd-arm.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Build susfsd arm -on: - push: - branches: [ "next" ] - paths: - - '.github/workflows/susfsd.yml' - - 'userspace/susfsd/**' - workflow_dispatch: - workflow_call: - inputs: - target: - required: true - type: string - os: - required: false - type: string - default: ubuntu-latest -jobs: - build-susfs: - name: Build userspace susfsd - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Build susfsd - working-directory: ./userspace/susfsd - run: $ANDROID_NDK/ndk-build - - - name: Upload armv7a Build Artifact - uses: actions/upload-artifact@v4 - with: - name: susfsd-armv7a-linux-androideabi - path: ./userspace/susfsd/libs - diff --git a/.github/workflows/susfsd-aarch64.yml b/.github/workflows/susfsd.yml similarity index 81% rename from .github/workflows/susfsd-aarch64.yml rename to .github/workflows/susfsd.yml index 5589db55..9a0003a2 100644 --- a/.github/workflows/susfsd-aarch64.yml +++ b/.github/workflows/susfsd.yml @@ -8,9 +8,6 @@ on: workflow_dispatch: workflow_call: inputs: - target: - required: true - type: string os: required: false type: string @@ -26,9 +23,9 @@ jobs: - name: Build susfsd working-directory: ./userspace/susfsd run: $ANDROID_NDK/ndk-build - - name: Upload arm64 Build Artifact + - name: Upload Build Artifacts uses: actions/upload-artifact@v4 with: - name: susfsd-aarch64-linux-android + name: susfsd-linux-android path: ./userspace/susfsd/libs