Skip to content

Commit a56873e

Browse files
TheWildJamesTheWildJames
committed
Update SUSFS to v1.5.12 and implement matrix build for v1.5.9 and v1.5.12
- Updated all SUSFS version references from v1.5.11 to v1.5.12 - Added matrix build configuration for SUSFSv1.5.9 and SUSFSv1.5.12 - v1.5.9 uses specific commit hashes for each Android/kernel combination - v1.5.12 uses latest commits (no specific checkout) - Updated patch paths to use dynamic SUSFS version from matrix - Modified SUSFS checkout logic to handle both versioned and latest commits
1 parent 99f3804 commit a56873e

File tree

2 files changed

+58
-33
lines changed

2 files changed

+58
-33
lines changed

‎.github/workflows/build.yml‎

Lines changed: 55 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
apply_module_check_bypass: [true, false]
30+
susfs_version:
31+
- version: "1.5.9"
32+
android15-6.6: "2598fee8963adab11c255bf28521df32912e027f"
33+
android14-6.1: "646cfabce9d5dba5b806e9cbe2c198128ebd0e69"
34+
android14-5.15: "ab4d9570a9494a67c290002f3b28e69dd370a0f5"
35+
android13-5.15: "a21f265695f2869a6f3fc71a70328aa6d0f4a3ae"
36+
android13-5.10: "8acbd10775a447f546b14c6bded6f476a7f4733f"
37+
android12-5.10: "6f42c0e24e35a6fa0fc43051a5f1e7dfe568e8c2"
38+
- version: "1.5.12"
3039

3140
steps:
3241
# # - name: Maximize Build Space
@@ -86,32 +95,47 @@ jobs:
8695
git clone https://github.com/WildKernels/kernel_patches.git
8796
git clone https://gitlab.com/simonpunk/susfs4ksu.git -b "$SUSFS_BRANCH"
8897
89-
## Checkout specific commits for certain Android/kernel version combinations
90-
#if [ "${{ inputs.android_version }}-${{ inputs.kernel_version }}" = "android12-5.10" ]; then
91-
# cd susfs4ksu
92-
# git checkout 0ed20c1656af7806a1760837ad320e62a8fb40fd
93-
# cd ..
94-
#elif [ "${{ inputs.android_version }}-${{ inputs.kernel_version }}" = "android13-5.10" ]; then
95-
# cd susfs4ksu
96-
# git checkout 19e5b616464577c986e079cea0700428422bccb5
97-
# cd ..
98-
#elif [ "${{ inputs.android_version }}-${{ inputs.kernel_version }}" = "android13-5.15" ]; then
99-
# cd susfs4ksu
100-
# git checkout b443e5be35cd8275b97a776f8cc84fbbf8169749
101-
# cd ..
102-
#elif [ "${{ inputs.android_version }}-${{ inputs.kernel_version }}" = "android14-5.15" ]; then
103-
# cd susfs4ksu
104-
# git checkout 40823c6a92d072721c2c05f37776f69e3689ce8f
105-
# cd ..
106-
#elif [ "${{ inputs.android_version }}-${{ inputs.kernel_version }}" = "android14-6.1" ]; then
107-
# cd susfs4ksu
108-
# git checkout 0e19a05277d28182c7b653580117145c53e69e92
109-
# cd ..
110-
#elif [ "${{ inputs.android_version }}-${{ inputs.kernel_version }}" = "android15-6.6" ]; then
111-
# cd susfs4ksu
112-
# git checkout ef036830ec9d56035d63d328185281c09726b20f
113-
# cd ..
114-
#fi
98+
# Checkout specific commits based on matrix configuration
99+
cd susfs4ksu
100+
ANDROID_KERNEL_COMBO="${{ inputs.android_version }}-${{ inputs.kernel_version }}"
101+
SUSFS_VERSION="${{ matrix.susfs_version.version }}"
102+
103+
# For v1.5.12, use latest commits (no checkout needed)
104+
# For v1.5.9, checkout specific commits
105+
if [ "$SUSFS_VERSION" = "1.5.9" ]; then
106+
# Get the commit hash for the current Android/kernel combination from matrix
107+
case "$ANDROID_KERNEL_COMBO" in
108+
"android15-6.6")
109+
COMMIT_HASH="${{ matrix.susfs_version.android15-6.6 }}"
110+
;;
111+
"android14-6.1")
112+
COMMIT_HASH="${{ matrix.susfs_version.android14-6.1 }}"
113+
;;
114+
"android14-5.15")
115+
COMMIT_HASH="${{ matrix.susfs_version.android14-5.15 }}"
116+
;;
117+
"android13-5.15")
118+
COMMIT_HASH="${{ matrix.susfs_version.android13-5.15 }}"
119+
;;
120+
"android13-5.10")
121+
COMMIT_HASH="${{ matrix.susfs_version.android13-5.10 }}"
122+
;;
123+
"android12-5.10")
124+
COMMIT_HASH="${{ matrix.susfs_version.android12-5.10 }}"
125+
;;
126+
*)
127+
echo "No specific commit hash defined for $ANDROID_KERNEL_COMBO"
128+
;;
129+
esac
130+
131+
if [ ! -z "$COMMIT_HASH" ]; then
132+
echo "Checking out SUSFS commit: $COMMIT_HASH for $ANDROID_KERNEL_COMBO (SUSFS v$SUSFS_VERSION)"
133+
git checkout "$COMMIT_HASH"
134+
fi
135+
else
136+
echo "Using latest SUSFS commits for v$SUSFS_VERSION"
137+
fi
138+
cd ..
115139
116140
117141
- name: Initialize and Sync Kernel Source
@@ -207,19 +231,20 @@ jobs:
207231
patch -p1 < 10_enable_susfs_for_ksu.patch || true
208232
209233
# Apply compatibility fixes
210-
cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.11/fix_core_hook.c.patch ./
234+
SUSFS_VERSION="${{ matrix.susfs_version.version }}"
235+
cp ../../kernel_patches/wild/susfs_fix_patches/v${SUSFS_VERSION}/fix_core_hook.c.patch ./
211236
patch -p1 < fix_core_hook.c.patch
212237
213238
## Skip fix_rules.c.patch for Android 14 with kernel 6.1
214239
#if [ "${{ inputs.android_version }}" != "android14" ] && [ "${{ inputs.kernel_version }}" != "6.1" ]; then
215-
# cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.11/fix_rules.c.patch ./
240+
# cp ../../kernel_patches/wild/susfs_fix_patches/v${SUSFS_VERSION}/fix_rules.c.patch ./
216241
# patch -p1 < fix_rules.c.patch
217242
#fi
218243
219-
cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.11/fix_sucompat.c.patch ./
244+
cp ../../kernel_patches/wild/susfs_fix_patches/v${SUSFS_VERSION}/fix_sucompat.c.patch ./
220245
patch -p1 < fix_sucompat.c.patch
221246
222-
cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.11/fix_kernel_compat.c.patch ./
247+
cp ../../kernel_patches/wild/susfs_fix_patches/v${SUSFS_VERSION}/fix_kernel_compat.c.patch ./
223248
patch -p1 < fix_kernel_compat.c.patch
224249
225250
- name: Apply Hooks Patches

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
env:
5757
GH_TOKEN: ${{ github.token }}
58-
RELEASE_NAME: "!!TESTING!! GKI Kernels With WKSU & SUSFS v1.5.11 !!!TESTING!!!"
58+
RELEASE_NAME: "!!TESTING!! GKI Kernels With WKSU & SUSFS v1.5.12 !!!TESTING!!!"
5959
RELEASE_BODY:
6060
steps:
6161
# # - name: Maximize Build Space
@@ -121,7 +121,7 @@ jobs:
121121
run: |
122122
LATEST_TAG=$(gh api repos/${{ github.repository }}/tags --jq '.[0].name')
123123
if [ -z "$LATEST_TAG" ]; then
124-
LATEST_TAG="v1.5.11-r0"
124+
LATEST_TAG="v1.5.12-r0"
125125
fi
126126
127127
NEW_TAG=$(echo "$LATEST_TAG" | awk -F'-r' '{suffix=$2; if (!suffix) suffix=0; suffix++; printf "%s-r%d", $1, suffix}')
@@ -158,7 +158,7 @@ jobs:
158158
Features:
159159
-> Wild KSU
160160
-> Multi Manager Support for WKSU, KernelSU-Next! Needs Testing: KSU, MKSU RKSU, xxKSU, KowSU and SukiSU (Best compatibility with WKSU, no support will be provided for other managers)
161-
-> SUSFS ඞ v1.5.11
161+
-> SUSFS ඞ v1.5.12
162162
-> Scope-Minimized Manual hooks v1.4
163163
-> Ptrace Patch Support for Older Kernels (<5.16)
164164
-> IPSet Support for Advanced Network Filtering

0 commit comments

Comments
 (0)