Skip to content

Commit b68ea38

Browse files
committed
Update Workflow based on Remote Action
1 parent 81adc42 commit b68ea38

File tree

1 file changed

+36
-31
lines changed

1 file changed

+36
-31
lines changed

.github/workflows/build-kernel-release.yml

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,38 @@ on:
2020
- stable
2121
- next
2222
default: next
23-
android12-5_10_susfs_branch:
24-
description: "Choose SusFS Branch for android12-5.10"
23+
optimize_level:
24+
description: "Compiler optimization level"
25+
required: true
26+
type: choice
27+
options:
28+
- O2
29+
- O3
30+
default: O2
31+
android12-5_10_susfs_branch_or_commit:
32+
description: 'Enter SusFS Branch or commit hash for android12-5.10'
2533
type: string
26-
default: "gki-android12-5.10"
27-
android13-5_10_susfs_branch:
28-
description: "Choose SusFS Branch for android13-5.10"
34+
default: ''
35+
android13-5_10_susfs_branch_or_commit:
36+
description: 'Enter SusFS Branch or commit hash for android13-5.10'
2937
type: string
30-
default: "gki-android13-5.10"
31-
android13-5_15_susfs_branch:
32-
description: "Choose SusFS Branch for android13-5.15"
38+
default: ''
39+
android13-5_15_susfs_branch_or_commit:
40+
description: 'Enter SusFS Branch or commit hash for android13-5.15'
3341
type: string
34-
default: "gki-android13-5.15"
35-
android14-5_15_susfs_branch:
36-
description: "Choose SusFS Branch for android14-5.15"
42+
default: ''
43+
android14-5_15_susfs_branch_or_commit:
44+
description: 'Enter SusFS Branch or commit hash for android14-5.15'
3745
type: string
38-
default: "gki-android14-5.15"
39-
android14-6_1_susfs_branch:
40-
description: "Choose SusFS Branch for android14-6.1"
46+
default: ''
47+
android14-6_1_susfs_branch_or_commit:
48+
description: 'Enter SusFS Branch or commit hash for android14-6.1'
4149
type: string
42-
default: "gki-android14-6.1"
43-
android15-6_6_susfs_branch:
44-
description: "Choose SusFS Branch for android15-6.6"
50+
default: ''
51+
android15-6_6_susfs_branch_or_commit:
52+
description: 'Enter SusFS Branch or commit hash for android15-6.6'
4553
type: string
46-
default: "gki-android15-6.6"
54+
default: ''
4755

4856
jobs:
4957
build-batch-1:
@@ -65,35 +73,33 @@ jobs:
6573
run: |
6674
KERNEL_STRING="${{ matrix.android_version }}-${{ matrix.kernel_version }}"
6775
76+
SUSFS_BRANCH=""
77+
6878
case "$KERNEL_STRING" in
6979
"android12-5.10")
70-
SUSFS_BRANCH="${{ inputs.android12-5_10_susfs_branch }}"
80+
SUSFS_BRANCH="${{ inputs.android12-5_10_susfs_branch_or_commit }}"
7181
;;
7282
"android13-5.10")
73-
SUSFS_BRANCH="${{ inputs.android13-5_10_susfs_branch }}"
83+
SUSFS_BRANCH="${{ inputs.android13-5_10_susfs_branch_or_commit }}"
7484
;;
7585
"android13-5.15")
76-
SUSFS_BRANCH="${{ inputs.android13-5_15_susfs_branch }}"
86+
SUSFS_BRANCH="${{ inputs.android13-5_15_susfs_branch_or_commit }}"
7787
;;
7888
"android14-5.15")
79-
SUSFS_BRANCH="${{ inputs.android14-5_15_susfs_branch }}"
89+
SUSFS_BRANCH="${{ inputs.android14-5_15_susfs_branch_or_commit }}"
8090
;;
8191
"android14-6.1")
82-
SUSFS_BRANCH="${{ inputs.android14-6_1_susfs_branch }}"
92+
SUSFS_BRANCH="${{ inputs.android14-6_1_susfs_branch_or_commit }}"
8393
;;
8494
"android15-6.6")
85-
SUSFS_BRANCH="${{ inputs.android15-6_6_susfs_branch }}"
95+
SUSFS_BRANCH="${{ inputs.android15-6_6_susfs_branch_or_commit }}"
8696
;;
8797
*)
8898
echo "Invalid kernel version or unsupported: $KERNEL_STRING"
8999
exit 1
90100
;;
91101
esac
92102
93-
if [[ -z "$SUSFS_BRANCH" ]]; then
94-
SUSFS_BRANCH="gki-${{ matrix.android_version }}-${{ matrix.kernel_version }}"
95-
fi
96-
97103
echo "susfs_branch=$SUSFS_BRANCH" >> $GITHUB_OUTPUT
98104
99105
- name: Checkout Code
@@ -106,10 +112,9 @@ jobs:
106112
soc: ${{ matrix.soc }}
107113
branch: ${{ matrix.branch }}
108114
manifest: ${{ matrix.manifest }}
109-
android_version: ${{ matrix.android_version }}
110-
kernel_version: ${{ matrix.kernel_version }}
111115
ksun_branch: ${{ inputs.ksun_branch }}
112-
susfs_branch: ${{ steps.get-susfs-branch.outputs.susfs_branch }}
116+
susfs_commit_hash_or_branch: ${{ steps.get-susfs-branch.outputs.susfs_branch }}
117+
optimize_level: ${{ inputs.optimize_level }}
113118

114119
trigger-release:
115120
needs:

0 commit comments

Comments
 (0)