Skip to content

Commit f65f965

Browse files
[CI] Enable build in manual run for sycl_linux_build_and_test.yml (#10591)
This PR treats empty matrix inputs same as '[]' in sycl_linux_build_and_test.yml because the latter is generated by the matrix generator yet we can't have that many input parameters for manual trigger. Later PR would move the call to matrix generation into this workflow (replacing 3 input parameters with just one) and would enable E2E/CTS as well.
1 parent 1466ba7 commit f65f965

File tree

1 file changed

+36
-70
lines changed

1 file changed

+36
-70
lines changed

.github/workflows/sycl_linux_build_and_test.yml

Lines changed: 36 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -69,81 +69,47 @@ on:
6969

7070
workflow_dispatch:
7171
inputs:
72+
changes:
73+
description: 'Filter matches for the changed files in the PR'
74+
type: choice
75+
options:
76+
- "[]"
77+
- '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
78+
build_image:
79+
type: choice
80+
options:
81+
- "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build"
7282
cc:
7383
type: choice
7484
options:
7585
- gcc
76-
- clang
7786
cxx:
7887
type: choice
7988
options:
8089
- g++
81-
- clang++
82-
# build_image:
83-
# type: choice
84-
# options:
85-
# - "ghcr.io/intel/llvm/ubuntu2204_build_nightly:latest"
86-
# build_ref:
87-
# type: choice
88-
# options:
89-
# - ""
90-
# build_cache_root:
91-
# description: |
92-
# Please select "/__w/llvm" if using clang/clang++.
93-
# type: choice
94-
# options:
95-
# - "/__w/"
96-
# - "/__w/llvm"
97-
# build_cache_suffix:
98-
# type: choice
99-
# options:
100-
# - "default"
101-
# build_configure_extra_args:
102-
# type: choice
103-
# options:
104-
# - "--hip --cuda --enable-esimd-emulator"
105-
# build_artifact_suffix:
106-
# type: choice
107-
# options:
108-
# - "default"
109-
110-
# lts_matrix:
111-
# type: choice
112-
# options:
113-
# - "[]"
114-
# lts_aws_matrix:
115-
# type: choice
116-
# options:
117-
# - "[]"
118-
119-
# cts_matrix:
120-
# type: choice
121-
# options:
122-
# - "[]"
123-
# cts_cmake_extra_args:
124-
# type: choice
125-
# options:
126-
# - ""
127-
128-
# changes:
129-
# description: 'Filter matches for the changed files in the PR'
130-
# type: choice
131-
# options:
132-
# - "[]"
133-
# - '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
134-
135-
# merge_ref:
136-
# description: |
137-
# Commit-ish to merge post-checkout if non-empty. Must be reachable from
138-
# the default_branch input paramter.
139-
# type: choice
140-
# options:
141-
# - "FETCH_HEAD"
90+
build_configure_extra_args:
91+
type: choice
92+
options:
93+
- "--hip --cuda --enable-esimd-emulator"
94+
# Cache properties need to match CC/CXX/CMake opts. Any additional choices
95+
# would need extra care.
96+
build_cache_root:
97+
type: choice
98+
options:
99+
- "/__w/"
100+
build_cache_suffix:
101+
type: choice
102+
options:
103+
- "default"
142104

143-
# retention-days:
144-
# type: choice
145-
# options:
146-
# - 3
105+
build_artifact_suffix:
106+
type: choice
107+
options:
108+
- "default"
109+
retention-days:
110+
type: choice
111+
options:
112+
- 3
147113

148114
jobs:
149115
build:
@@ -285,7 +251,7 @@ jobs:
285251
aws-start:
286252
name: Start AWS
287253
needs: build
288-
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' && inputs.lts_aws_matrix != '[]' }}
254+
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' && inputs.lts_aws_matrix != '[]' && inputs.lts_aws_matrix != '' }}
289255
uses: ./.github/workflows/aws.yml
290256
secrets: inherit
291257
with:
@@ -296,7 +262,7 @@ jobs:
296262
needs: [build, aws-start]
297263
# Continue if build was successful. If aws-start is not successful all
298264
# AWS tasks will fail, but all non-AWS tasks should continue.
299-
if: ${{ always() && needs.build.outputs.build_conclusion == 'success' && inputs.lts_matrix != '[]' }}
265+
if: ${{ always() && needs.build.outputs.build_conclusion == 'success' && inputs.lts_matrix != '[]' && inputs.lts_matrix != '' }}
300266
strategy:
301267
fail-fast: false
302268
matrix:
@@ -323,7 +289,7 @@ jobs:
323289

324290
khronos_sycl_cts:
325291
needs: build
326-
if: ${{ inputs.cts_matrix != '[]' && inputs.check_sycl == 'true' }}
292+
if: ${{ inputs.cts_matrix != '[]' && inputs.cts_matrix != '' && inputs.check_sycl == 'true' }}
327293
strategy:
328294
fail-fast: false
329295
matrix:
@@ -375,7 +341,7 @@ jobs:
375341
needs: [ aws-start, e2e-tests ]
376342
# Always attempt to shutdown AWS instance, even if AWS start was not
377343
# successful.
378-
if: ${{ always() && inputs.lts_aws_matrix != '[]' }}
344+
if: ${{ always() && inputs.lts_aws_matrix != '[]' && inputs.lts_aws_matrix != '' }}
379345
uses: ./.github/workflows/aws.yml
380346
secrets: inherit
381347
with:

0 commit comments

Comments
 (0)