Skip to content

Commit 121205f

Browse files
lupyuenxiaoxiang781216
authored andcommitted
CI: Increase CI Jobs to 100% for Complex PRs
This PR increases the CI Jobs for Complex PRs from 50% to 100%, as explained here: - apache/nuttx#15451 (comment) This PR also includes the fix for Simple x86 PR: - apache/nuttx#14896
1 parent 6c7bc3c commit 121205f

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

.github/workflows/arch.yml

+16-10
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ jobs:
7676
echo 'arch_contains_sim=1' | tee -a $GITHUB_OUTPUT
7777
elif [[ "$labels" == *"Arch: x86_64"* ]]; then
7878
echo 'arch_contains_x86_64=1' | tee -a $GITHUB_OUTPUT
79+
elif [[ "$labels" == *"Arch: x86"* ]]; then
80+
echo 'arch_contains_x86=1' | tee -a $GITHUB_OUTPUT
7981
elif [[ "$labels" == *"Arch: xtensa"* ]]; then
8082
echo 'arch_contains_xtensa=1' | tee -a $GITHUB_OUTPUT
8183
fi
@@ -91,6 +93,8 @@ jobs:
9193
echo 'board_contains_sim=1' | tee -a $GITHUB_OUTPUT
9294
elif [[ "$labels" == *"Board: x86_64"* ]]; then
9395
echo 'board_contains_x86_64=1' | tee -a $GITHUB_OUTPUT
96+
elif [[ "$labels" == *"Board: x86"* ]]; then
97+
echo 'board_contains_x86=1' | tee -a $GITHUB_OUTPUT
9498
elif [[ "$labels" == *"Board: xtensa"* ]]; then
9599
echo 'board_contains_xtensa=1' | tee -a $GITHUB_OUTPUT
96100
fi
@@ -119,12 +123,14 @@ jobs:
119123
arch_contains_arm64=${{ steps.get-arch.outputs.arch_contains_arm64 }}
120124
arch_contains_riscv=${{ steps.get-arch.outputs.arch_contains_riscv }}
121125
arch_contains_sim=${{ steps.get-arch.outputs.arch_contains_sim }}
126+
arch_contains_x86=${{ steps.get-arch.outputs.arch_contains_x86 }}
122127
arch_contains_x86_64=${{ steps.get-arch.outputs.arch_contains_x86_64 }}
123128
arch_contains_xtensa=${{ steps.get-arch.outputs.arch_contains_xtensa }}
124129
board_contains_arm=${{ steps.get-arch.outputs.board_contains_arm }}
125130
board_contains_arm64=${{ steps.get-arch.outputs.board_contains_arm64 }}
126131
board_contains_riscv=${{ steps.get-arch.outputs.board_contains_riscv }}
127132
board_contains_sim=${{ steps.get-arch.outputs.board_contains_sim }}
133+
board_contains_x86=${{ steps.get-arch.outputs.board_contains_x86 }}
128134
board_contains_x86_64=${{ steps.get-arch.outputs.board_contains_x86_64 }}
129135
board_contains_xtensa=${{ steps.get-arch.outputs.board_contains_xtensa }}
130136
@@ -151,6 +157,7 @@ jobs:
151157
"$arch_contains_arm64" != "$board_contains_arm64" ||
152158
"$arch_contains_riscv" != "$board_contains_riscv" ||
153159
"$arch_contains_sim" != "$board_contains_sim" ||
160+
"$arch_contains_x86" != "$board_contains_x86" ||
154161
"$arch_contains_x86_64" != "$board_contains_x86_64" ||
155162
"$arch_contains_xtensa" != "$board_contains_xtensa"
156163
]]; then
@@ -166,21 +173,14 @@ jobs:
166173
167174
# If Not a Simple PR: Build all targets
168175
if [[ "$quit" == "1" ]]; then
169-
# If PR was Created or Modified: Exclude some boards
176+
# If PR was Created or Modified: Include all boards
170177
pr=${{github.event.pull_request.number}}
171178
if [[ "$pr" != "" ]]; then
172-
echo "Excluding arm-0[1249], arm-1[124-9], risc-v-04..06, sim-03, xtensa-02"
179+
echo "Include all boards"
173180
boards=$(
174181
echo '${{ inputs.boards }}' |
175182
jq --compact-output \
176-
'map(
177-
select(
178-
test("arm-0[1249]") == false and test("arm-1[124-9]") == false and
179-
test("risc-v-0[4-9]") == false and
180-
test("sim-0[3-9]") == false and
181-
test("xtensa-0[2-9]") == false
182-
)
183-
)'
183+
'.'
184184
)
185185
fi
186186
echo "selected_builds=$boards" | tee -a $GITHUB_OUTPUT
@@ -218,6 +218,12 @@ jobs:
218218
skip_build=1
219219
fi
220220

221+
# For "Arch / Board: x86": Build other
222+
elif [[ "$arch_contains_x86" == "1" || "$board_contains_x86" == "1" ]]; then
223+
if [[ "$board" != *"other"* ]]; then
224+
skip_build=1
225+
fi
226+
221227
# For "Arch / Board: x86_64": Build x86_64-01
222228
elif [[ "$arch_contains_x86_64" == "1" || "$board_contains_x86_64" == "1" ]]; then
223229
if [[ "$board" != *"x86_64-"* ]]; then

0 commit comments

Comments
 (0)