br0kenpixel/KernelSU-Next
1
0
Fork 0
mirror of https://github.com/KernelSU-Next/KernelSU-Next.git synced 2025-08-27 23:46:34 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

ci: Only have one task for susfsd irrespective of the target architecture (#395)

Browse Source
This commit is contained in:
Trijal Saha
2025-05-18 12:49:39 -04:00
committed by GitHub
parent e5a495489d
commit aaca0b5283
6 changed files with 29 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/build-manager-ci.yml vendored
View File

@@ -23,32 +23,18 @@ jobs:
# uses: ./.github/workflows/build-lkm.yml # uses: ./.github/workflows/build-lkm.yml
# secrets: inherit # secrets: inherit
build-susfsd-aarch64: build-susfsd:
# needs: build-lkm # needs: build-lkm
strategy: strategy:
matrix: matrix:
include: include:
- target: aarch64-linux-android - os: ubuntu-latest
os: ubuntu-latest uses: ./.github/workflows/susfsd.yml
uses: ./.github/workflows/susfsd-aarch64.yml
with: 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 }} os: ${{ matrix.os }}
build-ksud: build-ksud:
needs: build-susfsd-arm needs: build-susfsd
strategy: strategy:
matrix: matrix:
include: include:
@@ -104,16 +90,10 @@ jobs:
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v4 uses: gradle/actions/setup-gradle@v4
- name: Download arm64 susfsd - name: Download susfsd
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: susfsd-aarch64-linux-android name: susfsd-linux-android
path: .
- name: Download arm susfsd
uses: actions/download-artifact@v4
with:
name: susfsd-armv7a-linux-androideabi
path: . path: .
- name: Copy susfsd to app jniLibs - name: Copy susfsd to app jniLibs
@@ -210,4 +190,4 @@ jobs:
APK=$(find ./app/build/outputs/apk/release -name "*.apk") APK=$(find ./app/build/outputs/apk/release -name "*.apk")
pip3 install telethon pip3 install telethon
python3 $GITHUB_WORKSPACE/scripts/ksunextbot.py $APK python3 $GITHUB_WORKSPACE/scripts/ksunextbot.py $APK
fi fi

35
.github/workflows/build-manager-spoofed.yml vendored
View File

@@ -25,32 +25,18 @@ jobs:
# uses: ./.github/workflows/build-lkm.yml # uses: ./.github/workflows/build-lkm.yml
# secrets: inherit # secrets: inherit
build-susfsd-aarch64: build-susfsd:
# needs: build-lkm # needs: build-lkm
strategy: strategy:
matrix: matrix:
include: include:
- target: aarch64-linux-android - os: ubuntu-latest
os: ubuntu-latest uses: ./.github/workflows/susfsd.yml
uses: ./.github/workflows/susfsd-aarch64.yml
with: 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 }} os: ${{ matrix.os }}
build-ksud: build-ksud:
needs: build-susfsd-arm needs: build-susfsd
strategy: strategy:
matrix: matrix:
include: include:
@@ -110,16 +96,11 @@ jobs:
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v4 uses: gradle/actions/setup-gradle@v4
- name: Download arm64 susfsd
- name: Download susfsd
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: susfsd-aarch64-linux-android name: susfsd-linux-android
path: .
- name: Download arm susfsd
uses: actions/download-artifact@v4
with:
name: susfsd-armv7a-linux-androideabi
path: . path: .
- name: Copy susfsd to app jniLibs - name: Copy susfsd to app jniLibs
@@ -216,4 +197,4 @@ jobs:
APK=$(find ./app/build/outputs/apk/release -name "*.apk") APK=$(find ./app/build/outputs/apk/release -name "*.apk")
pip3 install telethon pip3 install telethon
python3 $GITHUB_WORKSPACE/scripts/ksunextbot.py $APK python3 $GITHUB_WORKSPACE/scripts/ksunextbot.py $APK
fi fi

34
.github/workflows/build-manager.yml vendored
View File

@@ -23,32 +23,18 @@ jobs:
# uses: ./.github/workflows/build-lkm.yml # uses: ./.github/workflows/build-lkm.yml
# secrets: inherit // DISBAND LKM MODE # secrets: inherit // DISBAND LKM MODE
build-susfsd-aarch64: build-susfsd:
# needs: build-lkm # needs: build-lkm
strategy: strategy:
matrix: matrix:
include: include:
- target: aarch64-linux-android - os: ubuntu-latest
os: ubuntu-latest uses: ./.github/workflows/susfsd.yml
uses: ./.github/workflows/susfsd-aarch64.yml
with: 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 }} os: ${{ matrix.os }}
build-ksud: build-ksud:
needs: build-susfsd-arm needs: build-susfsd
strategy: strategy:
matrix: matrix:
include: include:
@@ -104,16 +90,10 @@ jobs:
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v4 uses: gradle/actions/setup-gradle@v4
- name: Download arm64 susfsd - name: Download susfsd
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: susfsd-aarch64-linux-android name: susfsd-linux-android
path: .
- name: Download arm susfsd
uses: actions/download-artifact@v4
with:
name: susfsd-armv7a-linux-androideabi
path: . path: .
- name: Copy susfsd to app jniLibs - name: Copy susfsd to app jniLibs
@@ -210,4 +190,4 @@ jobs:
APK=$(find ./app/build/outputs/apk/release -name "*.apk") APK=$(find ./app/build/outputs/apk/release -name "*.apk")
pip3 install telethon pip3 install telethon
python3 $GITHUB_WORKSPACE/scripts/ksunextbot.py $APK python3 $GITHUB_WORKSPACE/scripts/ksunextbot.py $APK
fi fi

10
.github/workflows/ksud.yml vendored
View File

@@ -37,10 +37,10 @@ jobs:
- name: Import susfsd Libraries - name: Import susfsd Libraries
run: | run: |
cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_overlayfs/bin/aarch64/ cp susfsd-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-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-linux-android/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/armeabi-v7a/susfsd ./userspace/ksud_magic/bin/arm/
- name: Setup Rust - name: Setup Rust
run: | run: |
@@ -78,4 +78,4 @@ jobs:
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: ksud_magic-${{ inputs.target }} name: ksud_magic-${{ inputs.target }}
path: userspace/ksud_magic/target/**/release/ksud* path: userspace/ksud_magic/target/**/release/ksud*

35
.github/workflows/susfsd-arm.yml vendored
View File

@@ -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

7
.github/workflows/susfsd-aarch64.yml → .github/workflows/susfsd.yml vendored
View File

@@ -8,9 +8,6 @@ on:
workflow_dispatch: workflow_dispatch:
workflow_call: workflow_call:
inputs: inputs:
target:
required: true
type: string
os: os:
required: false required: false
type: string type: string
@@ -26,9 +23,9 @@ jobs:
- name: Build susfsd - name: Build susfsd
working-directory: ./userspace/susfsd working-directory: ./userspace/susfsd
run: $ANDROID_NDK/ndk-build run: $ANDROID_NDK/ndk-build
- name: Upload arm64 Build Artifact - name: Upload Build Artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: susfsd-aarch64-linux-android name: susfsd-linux-android
path: ./userspace/susfsd/libs path: ./userspace/susfsd/libs