Skip to content

Commit 8d4704a

Browse files
TheWildJamesTheWildJames
committed
Give SukiSU-Ultra its own SUSFS pin set
1 parent d278c3d commit 8d4704a

1 file changed

Lines changed: 35 additions & 8 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,13 @@ jobs:
134134
susfs_commit_android14_6_1_resukisu: ${{ steps.resolve.outputs.susfs_commit_android14_6_1_resukisu }}
135135
susfs_commit_android15_6_6_resukisu: ${{ steps.resolve.outputs.susfs_commit_android15_6_6_resukisu }}
136136
susfs_commit_android16_6_12_resukisu: ${{ steps.resolve.outputs.susfs_commit_android16_6_12_resukisu }}
137+
susfs_commit_android12_5_10_sukisu_ultra: ${{ steps.resolve.outputs.susfs_commit_android12_5_10_sukisu_ultra }}
138+
susfs_commit_android13_5_10_sukisu_ultra: ${{ steps.resolve.outputs.susfs_commit_android13_5_10_sukisu_ultra }}
139+
susfs_commit_android13_5_15_sukisu_ultra: ${{ steps.resolve.outputs.susfs_commit_android13_5_15_sukisu_ultra }}
140+
susfs_commit_android14_5_15_sukisu_ultra: ${{ steps.resolve.outputs.susfs_commit_android14_5_15_sukisu_ultra }}
141+
susfs_commit_android14_6_1_sukisu_ultra: ${{ steps.resolve.outputs.susfs_commit_android14_6_1_sukisu_ultra }}
142+
susfs_commit_android15_6_6_sukisu_ultra: ${{ steps.resolve.outputs.susfs_commit_android15_6_6_sukisu_ultra }}
143+
susfs_commit_android16_6_12_sukisu_ultra: ${{ steps.resolve.outputs.susfs_commit_android16_6_12_sukisu_ultra }}
137144
ksu_commit: ${{ steps.resolve.outputs.ksu_commit }}
138145
resukisu_commit: ${{ steps.resolve.outputs.resukisu_commit }}
139146
sukisu_ultra_commit: ${{ steps.resolve.outputs.sukisu_ultra_commit }}
@@ -203,6 +210,16 @@ jobs:
203210
[susfs_commit_android15_6_6]="937215cb3a1b1f333d764c366c7a49972fa8e7a0"
204211
[susfs_commit_android16_6_12]="7d91da2d2ce056d1abf378d9199aaf1072d37ab0"
205212
)
213+
# SukiSU-Ultra keeps its own SUSFS pin set too (same starting values).
214+
declare -A PIN_SUSFS_SUKISU_ULTRA=(
215+
[susfs_commit_android12_5_10]="ec785f47d49f7b3871ca9356f450411020af7017"
216+
[susfs_commit_android13_5_10]="ed3d6d9c9a2652e1c70f153f5358701e996d646c"
217+
[susfs_commit_android13_5_15]="bca0d2333c1a7d717e7278b019d7af7ba1d16005"
218+
[susfs_commit_android14_5_15]="d54b51724afa912c4c99bb99731354ce934d1889"
219+
[susfs_commit_android14_6_1]="4fc9c1898ea66f51847cdbc0d1473ea4ef525a70"
220+
[susfs_commit_android15_6_6]="937215cb3a1b1f333d764c366c7a49972fa8e7a0"
221+
[susfs_commit_android16_6_12]="7d91da2d2ce056d1abf378d9199aaf1072d37ab0"
222+
)
206223
207224
pick() { # pinned repo ref -> pinned when verified, else latest
208225
local pinned="$1" repo="$2" ref="$3"
@@ -302,6 +319,8 @@ jobs:
302319
emit "$key" "$(pick "${PIN_SUSFS[$key]}" https://gitlab.com/simonpunk/susfs4ksu.git refs/heads/${SUSFS_BRANCHES[$key]})"
303320
# Per-flavor ReSukiSU SUSFS pin (same branch, own pin set).
304321
emit "${key}_resukisu" "$(pick "${PIN_SUSFS_RESUKISU[$key]}" https://gitlab.com/simonpunk/susfs4ksu.git refs/heads/${SUSFS_BRANCHES[$key]})"
322+
# Per-flavor SukiSU-Ultra SUSFS pin (same branch, own pin set).
323+
emit "${key}_sukisu_ultra" "$(pick "${PIN_SUSFS_SUKISU_ULTRA[$key]}" https://gitlab.com/simonpunk/susfs4ksu.git refs/heads/${SUSFS_BRANCHES[$key]})"
305324
done
306325
307326
# Tracked build helpers (resolved automatically, before the run)
@@ -667,7 +686,7 @@ jobs:
667686
with:
668687
config_file: .github/config/android12-5.10.json
669688
feature_set: ${{ needs.resolve-sources.outputs.feature_set }}
670-
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android12_5_10_resukisu || needs.resolve-sources.outputs.susfs_commit_android12_5_10 }}
689+
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android12_5_10_resukisu || (matrix.root.root_flavor == 'sukisu-ultra' && needs.resolve-sources.outputs.susfs_commit_android12_5_10_sukisu_ultra || needs.resolve-sources.outputs.susfs_commit_android12_5_10) }}
671690
nomount_commit: ${{ needs.resolve-sources.outputs.nomount_commit }}
672691
kernel_patches_commit: ${{ needs.resolve-sources.outputs.kernel_patches_commit }}
673692
root_flavor: ${{ matrix.root.root_flavor }}
@@ -696,7 +715,7 @@ jobs:
696715
with:
697716
config_file: .github/config/android13-5.10.json
698717
feature_set: ${{ needs.resolve-sources.outputs.feature_set }}
699-
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android13_5_10_resukisu || needs.resolve-sources.outputs.susfs_commit_android13_5_10 }}
718+
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android13_5_10_resukisu || (matrix.root.root_flavor == 'sukisu-ultra' && needs.resolve-sources.outputs.susfs_commit_android13_5_10_sukisu_ultra || needs.resolve-sources.outputs.susfs_commit_android13_5_10) }}
700719
nomount_commit: ${{ needs.resolve-sources.outputs.nomount_commit }}
701720
kernel_patches_commit: ${{ needs.resolve-sources.outputs.kernel_patches_commit }}
702721
root_flavor: ${{ matrix.root.root_flavor }}
@@ -725,7 +744,7 @@ jobs:
725744
with:
726745
config_file: .github/config/android13-5.15.json
727746
feature_set: ${{ needs.resolve-sources.outputs.feature_set }}
728-
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android13_5_15_resukisu || needs.resolve-sources.outputs.susfs_commit_android13_5_15 }}
747+
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android13_5_15_resukisu || (matrix.root.root_flavor == 'sukisu-ultra' && needs.resolve-sources.outputs.susfs_commit_android13_5_15_sukisu_ultra || needs.resolve-sources.outputs.susfs_commit_android13_5_15) }}
729748
nomount_commit: ${{ needs.resolve-sources.outputs.nomount_commit }}
730749
kernel_patches_commit: ${{ needs.resolve-sources.outputs.kernel_patches_commit }}
731750
root_flavor: ${{ matrix.root.root_flavor }}
@@ -754,7 +773,7 @@ jobs:
754773
with:
755774
config_file: .github/config/android14-5.15.json
756775
feature_set: ${{ needs.resolve-sources.outputs.feature_set }}
757-
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android14_5_15_resukisu || needs.resolve-sources.outputs.susfs_commit_android14_5_15 }}
776+
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android14_5_15_resukisu || (matrix.root.root_flavor == 'sukisu-ultra' && needs.resolve-sources.outputs.susfs_commit_android14_5_15_sukisu_ultra || needs.resolve-sources.outputs.susfs_commit_android14_5_15) }}
758777
nomount_commit: ${{ needs.resolve-sources.outputs.nomount_commit }}
759778
kernel_patches_commit: ${{ needs.resolve-sources.outputs.kernel_patches_commit }}
760779
root_flavor: ${{ matrix.root.root_flavor }}
@@ -783,7 +802,7 @@ jobs:
783802
with:
784803
config_file: .github/config/android14-6.1.json
785804
feature_set: ${{ needs.resolve-sources.outputs.feature_set }}
786-
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android14_6_1_resukisu || needs.resolve-sources.outputs.susfs_commit_android14_6_1 }}
805+
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android14_6_1_resukisu || (matrix.root.root_flavor == 'sukisu-ultra' && needs.resolve-sources.outputs.susfs_commit_android14_6_1_sukisu_ultra || needs.resolve-sources.outputs.susfs_commit_android14_6_1) }}
787806
nomount_commit: ${{ needs.resolve-sources.outputs.nomount_commit }}
788807
kernel_patches_commit: ${{ needs.resolve-sources.outputs.kernel_patches_commit }}
789808
root_flavor: ${{ matrix.root.root_flavor }}
@@ -812,7 +831,7 @@ jobs:
812831
with:
813832
config_file: .github/config/android15-6.6.json
814833
feature_set: ${{ needs.resolve-sources.outputs.feature_set }}
815-
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android15_6_6_resukisu || needs.resolve-sources.outputs.susfs_commit_android15_6_6 }}
834+
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android15_6_6_resukisu || (matrix.root.root_flavor == 'sukisu-ultra' && needs.resolve-sources.outputs.susfs_commit_android15_6_6_sukisu_ultra || needs.resolve-sources.outputs.susfs_commit_android15_6_6) }}
816835
nomount_commit: ${{ needs.resolve-sources.outputs.nomount_commit }}
817836
kernel_patches_commit: ${{ needs.resolve-sources.outputs.kernel_patches_commit }}
818837
root_flavor: ${{ matrix.root.root_flavor }}
@@ -841,7 +860,7 @@ jobs:
841860
with:
842861
config_file: .github/config/android16-6.12.json
843862
feature_set: ${{ needs.resolve-sources.outputs.feature_set }}
844-
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android16_6_12_resukisu || needs.resolve-sources.outputs.susfs_commit_android16_6_12 }}
863+
susfs_commit: ${{ matrix.root.root_flavor == 'resukisu' && needs.resolve-sources.outputs.susfs_commit_android16_6_12_resukisu || (matrix.root.root_flavor == 'sukisu-ultra' && needs.resolve-sources.outputs.susfs_commit_android16_6_12_sukisu_ultra || needs.resolve-sources.outputs.susfs_commit_android16_6_12) }}
845864
nomount_commit: ${{ needs.resolve-sources.outputs.nomount_commit }}
846865
kernel_patches_commit: ${{ needs.resolve-sources.outputs.kernel_patches_commit }}
847866
root_flavor: ${{ matrix.root.root_flavor }}
@@ -1487,6 +1506,13 @@ jobs:
14871506
SUSFS_ANDROID14_6_1_RESUKISU: ${{ needs.resolve-sources.outputs.susfs_commit_android14_6_1_resukisu }}
14881507
SUSFS_ANDROID15_6_6_RESUKISU: ${{ needs.resolve-sources.outputs.susfs_commit_android15_6_6_resukisu }}
14891508
SUSFS_ANDROID16_6_12_RESUKISU: ${{ needs.resolve-sources.outputs.susfs_commit_android16_6_12_resukisu }}
1509+
SUSFS_ANDROID12_5_10_SUKISU_ULTRA: ${{ needs.resolve-sources.outputs.susfs_commit_android12_5_10_sukisu_ultra }}
1510+
SUSFS_ANDROID13_5_10_SUKISU_ULTRA: ${{ needs.resolve-sources.outputs.susfs_commit_android13_5_10_sukisu_ultra }}
1511+
SUSFS_ANDROID13_5_15_SUKISU_ULTRA: ${{ needs.resolve-sources.outputs.susfs_commit_android13_5_15_sukisu_ultra }}
1512+
SUSFS_ANDROID14_5_15_SUKISU_ULTRA: ${{ needs.resolve-sources.outputs.susfs_commit_android14_5_15_sukisu_ultra }}
1513+
SUSFS_ANDROID14_6_1_SUKISU_ULTRA: ${{ needs.resolve-sources.outputs.susfs_commit_android14_6_1_sukisu_ultra }}
1514+
SUSFS_ANDROID15_6_6_SUKISU_ULTRA: ${{ needs.resolve-sources.outputs.susfs_commit_android15_6_6_sukisu_ultra }}
1515+
SUSFS_ANDROID16_6_12_SUKISU_ULTRA: ${{ needs.resolve-sources.outputs.susfs_commit_android16_6_12_sukisu_ultra }}
14901516
# KSU version not computed here; render will show placeholder if release job skipped
14911517
run: |
14921518
set -e
@@ -1571,6 +1597,7 @@ jobs:
15711597
variants=[_sel] if _sel else list(all_variants)
15721598
sus_map={"android12-5.10":env("SUSFS_ANDROID12_5_10",""),"android13-5.10":env("SUSFS_ANDROID13_5_10",""),"android13-5.15":env("SUSFS_ANDROID13_5_15",""),"android14-5.15":env("SUSFS_ANDROID14_5_15",""),"android14-6.1":env("SUSFS_ANDROID14_6_1",""),"android15-6.6":env("SUSFS_ANDROID15_6_6",""),"android16-6.12":env("SUSFS_ANDROID16_6_12","")}
15731599
sus_map_resukisu={"android12-5.10":env("SUSFS_ANDROID12_5_10_RESUKISU",""),"android13-5.10":env("SUSFS_ANDROID13_5_10_RESUKISU",""),"android13-5.15":env("SUSFS_ANDROID13_5_15_RESUKISU",""),"android14-5.15":env("SUSFS_ANDROID14_5_15_RESUKISU",""),"android14-6.1":env("SUSFS_ANDROID14_6_1_RESUKISU",""),"android15-6.6":env("SUSFS_ANDROID15_6_6_RESUKISU",""),"android16-6.12":env("SUSFS_ANDROID16_6_12_RESUKISU","")}
1600+
sus_map_sukisu_ultra={"android12-5.10":env("SUSFS_ANDROID12_5_10_SUKISU_ULTRA",""),"android13-5.10":env("SUSFS_ANDROID13_5_10_SUKISU_ULTRA",""),"android13-5.15":env("SUSFS_ANDROID13_5_15_SUKISU_ULTRA",""),"android14-5.15":env("SUSFS_ANDROID14_5_15_SUKISU_ULTRA",""),"android14-6.1":env("SUSFS_ANDROID14_6_1_SUKISU_ULTRA",""),"android15-6.6":env("SUSFS_ANDROID15_6_6_SUKISU_ULTRA",""),"android16-6.12":env("SUSFS_ANDROID16_6_12_SUKISU_ULTRA","")}
15741601
_flavors=[m.get("flavor","") for m in parse_managers(env("MANAGER_LIST","")) if m.get("flavor","")]
15751602
if not _flavors:
15761603
_flavors={"KernelSU-Next":["next"],"KernelSU":["kernelsu"],"ReSukiSU":["resukisu"],"SukiSU-Ultra":["sukisu-ultra"],"No Root":[],"All":["next","kernelsu","resukisu"]}.get(root,["next","kernelsu","resukisu"])
@@ -1581,7 +1608,7 @@ jobs:
15811608
for v in variants:
15821609
_row=f"| gki-{v} |"
15831610
for _fl in _flavors:
1584-
_sm=sus_map_resukisu if _fl=="resukisu" else sus_map
1611+
_sm=sus_map_sukisu_ultra if _fl=="sukisu-ultra" else (sus_map_resukisu if _fl=="resukisu" else sus_map)
15851612
sha=_sm.get(v,"")
15861613
sha_s=f"[`{sha[:7]}`]({_susfs_url}/-/commit/{sha})" if sha else "_n/a_"
15871614
_row+=f" {sha_s} |"

0 commit comments

Comments
 (0)