Skip to content

Commit 1dbe403

Browse files
aelovikov-intelaelovikov-intel
authored
[CI] Switch default merge_ref to empty (#16772)
There were a few places that didn't pass explicit `''` and all of them were actual bugs: * `sycl-nightly.yml` didn't pass it for windows build and run-tests * `sycl-nightly.yml` didn't pass it for `ubuntu2404_oneapi_build` job (passed for other linux build jobs)
1 parent 155fe36 commit 1dbe403

13 files changed

+2
-58
lines changed

‎.github/workflows/sycl-linux-build.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ on:
4040
description: 'Filter matches for the changed files in the PR'
4141
default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
4242
required: false
43-
merge_ref:
44-
description: |
45-
Commit-ish to merge post-checkout if non-empty. Must be reachable from
46-
the default_branch input paramter.
47-
type: string
48-
default: 'FETCH_HEAD'
4943
retention-days:
5044
description: 'Artifacts retention period'
5145
type: string
@@ -150,7 +144,6 @@ jobs:
150144
with:
151145
path: src
152146
ref: ${{ inputs.build_ref || github.sha }}
153-
merge_ref: ${{ inputs.merge_ref }}
154147
cache_path: "/__w/repo_cache/"
155148
- name: Setup oneAPI env
156149
if: ${{ inputs.cc == 'icx' || inputs.cxx == 'icpx' }}
@@ -281,7 +274,6 @@ jobs:
281274
uses: ./devops/actions/run-tests/e2e
282275
with:
283276
ref: ${{ inputs.ref || github.sha }}
284-
merge_ref: ${{ inputs.merge_ref }}
285277
e2e_testing_mode: build-only
286278
target_devices: all
287279
artifact_suffix: default

‎.github/workflows/sycl-linux-precommit-aws.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ jobs:
7272
# No idea why but that seems to work and be in sync with the main
7373
# pre-commit workflow.
7474
ref: ${{ github.event.workflow_run.referenced_workflows[0].sha }}
75-
merge_ref: ''
7675

7776
sycl_toolchain_artifact: sycl_linux_default
7877
sycl_toolchain_archive: llvm_sycl.tar.zst

‎.github/workflows/sycl-linux-precommit.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
uses: ./.github/workflows/sycl-linux-build.yml
4242
with:
4343
build_ref: ${{ github.sha }}
44-
merge_ref: ''
4544
build_cache_root: "/__w/"
4645
build_artifact_suffix: "default"
4746
build_cache_suffix: "default"
@@ -97,7 +96,6 @@ jobs:
9796
extra_lit_opts: --param fallback-to-build-if-requires-build-and-run=True ${{ matrix.extra_lit_opts }}
9897
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
9998
ref: ${{ github.sha }}
100-
merge_ref: ''
10199
sycl_toolchain_artifact: sycl_linux_default
102100
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
103101
sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
@@ -179,7 +177,6 @@ jobs:
179177
skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}
180178

181179
ref: ${{ github.sha }}
182-
merge_ref: ''
183180

184181
sycl_toolchain_artifact: sycl_linux_default
185182
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
@@ -228,7 +225,6 @@ jobs:
228225
extra_lit_opts: -a -j 1 --param enable-perf-tests=True
229226

230227
ref: ${{ github.sha }}
231-
merge_ref: ''
232228

233229
sycl_toolchain_artifact: sycl_linux_default
234230
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}

‎.github/workflows/sycl-linux-run-tests.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ on:
3838
ref:
3939
type: string
4040
required: True
41-
merge_ref:
42-
description: |
43-
Commit-ish to merge post-checkout if non-empty. Must be reachable from
44-
the default_branch input paramter.
45-
type: string
46-
default: 'FETCH_HEAD'
47-
required: False
4841

4942
sycl_toolchain_artifact:
5043
type: string
@@ -296,7 +289,6 @@ jobs:
296289
uses: ./devops/actions/run-tests/e2e
297290
with:
298291
ref: ${{ inputs.ref || github.sha }}
299-
merge_ref: ${{ inputs.merge_ref }}
300292
e2e_binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
301293
extra_cmake_args: ${{ inputs.extra_cmake_args }}
302294
e2e_testing_mode: ${{ inputs.e2e_testing_mode }}

‎.github/workflows/sycl-nightly.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
build_artifact_suffix: default
1818
build_configure_extra_args: '--hip --cuda'
1919
build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
20-
merge_ref: ''
2120
retention-days: 90
2221

2322
# We upload the build for people to download/use, override its name and
@@ -33,7 +32,6 @@ jobs:
3332
build_cache_suffix: sprod_shared
3433
build_artifact_suffix: sprod_shared
3534
build_configure_extra_args: '--shared-libs --hip --cuda --native_cpu'
36-
merge_ref: ''
3735

3836
artifact_archive_name: sycl_linux_shared.tar.zst
3937

@@ -112,7 +110,6 @@ jobs:
112110
extra_lit_opts: "--param 'cxx_flags=-D_GLIBCXX_USE_CXX11_ABI=0' ${{ matrix.extra_lit_opts }}"
113111
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
114112
ref: ${{ github.sha }}
115-
merge_ref: ''
116113
sycl_toolchain_artifact: sycl_linux_default
117114
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
118115
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
@@ -129,7 +126,6 @@ jobs:
129126
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
130127
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
131128
ref: ${{ github.sha }}
132-
merge_ref: ''
133129
sycl_toolchain_artifact: sycl_linux_oneapi
134130
sycl_toolchain_archive: ${{ needs.ubuntu2404_oneapi_build.outputs.artifact_archive_name }}
135131
sycl_toolchain_decompress_command: ${{ needs.ubuntu2404_oneapi_build.outputs.artifact_decompress_command }}
@@ -175,7 +171,6 @@ jobs:
175171
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
176172
target_devices: cuda:gpu
177173
ref: ${{ github.sha }}
178-
merge_ref: ''
179174

180175
sycl_toolchain_artifact: sycl_linux_default
181176
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}

‎.github/workflows/sycl-post-commit.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636
build_cache_suffix: default
3737
build_artifact_suffix: default
3838
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
39-
merge_ref: ''
4039

4140
e2e-lin:
4241
needs: [build-lin]
@@ -90,7 +89,6 @@ jobs:
9089
env: ${{ matrix.env || '{}' }}
9190

9291
ref: ${{ github.sha }}
93-
merge_ref: ''
9492

9593
sycl_toolchain_artifact: sycl_linux_default
9694
sycl_toolchain_archive: ${{ needs.build-lin.outputs.artifact_archive_name }}
@@ -106,8 +104,7 @@ jobs:
106104
compiler: icx
107105
build_configure_extra_args: --cmake-opt=-DCMAKE_C_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt=-DCMAKE_CXX_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt="-DCMAKE_EXE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_MODULE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_SHARED_LINKER_FLAGS=/manifest:no"
108106
build_cache_suffix: icx
109-
merge_ref: ''
110-
107+
111108
e2e-win:
112109
needs: build-win
113110
# Continue if build was successful.
@@ -121,7 +118,6 @@ jobs:
121118
runner: '["Windows","gen12"]'
122119
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
123120
compiler: icx
124-
merge_ref: ''
125121

126122
macos_default:
127123
name: macOS

‎.github/workflows/sycl-rel-nightly.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
build_artifact_suffix: default
4040
build_configure_extra_args: '--hip --cuda'
4141
build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
42-
merge_ref: ''
4342
build_ref: sycl-rel-6_0_0
4443

4544
# We upload the build for people to download/use, override its name and
@@ -109,7 +108,6 @@ jobs:
109108
extra_lit_opts: ${{ matrix.extra_lit_opts }}
110109
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
111110
ref: sycl-rel-6_0_0
112-
merge_ref: ''
113111
sycl_toolchain_artifact: sycl_linux_default
114112
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
115113
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
@@ -120,7 +118,6 @@ jobs:
120118
uses: ./.github/workflows/sycl-windows-build.yml
121119
with:
122120
ref: sycl-rel-6_0_0
123-
merge_ref: ''
124121

125122
# We upload both Linux/Windows build via Github's "Releases"
126123
# functionality, make sure Linux/Windows names follow the same pattern.
@@ -140,7 +137,6 @@ jobs:
140137
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
141138
extra_lit_opts: --param gpu-intel-gen12=True
142139
ref: sycl-rel-6_0_0
143-
merge_ref: ''
144140

145141
cuda-aws-start:
146142
needs: [ubuntu2204_build]
@@ -162,7 +158,6 @@ jobs:
162158
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
163159
target_devices: cuda:gpu
164160
ref: sycl-rel-6_0_0
165-
merge_ref: ''
166161

167162
sycl_toolchain_artifact: sycl_linux_default
168163
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}

‎.github/workflows/sycl-weekly.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
build_cache_root: "/__w/"
2020
build_artifact_suffix: default
2121
build_configure_extra_args: ''
22-
merge_ref: ''
2322

2423
build-sycl-cts:
2524
needs: ubuntu2204_build

‎.github/workflows/sycl-windows-build.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ on:
1818
ref:
1919
type: string
2020
required: False
21-
merge_ref:
22-
description: |
23-
Commit-ish to merge post-checkout if non-empty. Must be reachable from
24-
the default_branch input paramter.
25-
type: string
26-
default: 'FETCH_HEAD'
2721
artifact_archive_name:
2822
type: string
2923
default: llvm_sycl.tar.gz
@@ -106,7 +100,6 @@ jobs:
106100
with:
107101
path: src
108102
ref: ${{ inputs.ref || github.sha }}
109-
merge_ref: ${{ inputs.merge_ref }}
110103
cache_path: "D:\\\\github\\\\_work\\\\repo_cache\\\\"
111104
- name: Configure
112105
shell: cmd

‎.github/workflows/sycl-windows-precommit.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
uses: ./.github/workflows/sycl-windows-build.yml
4343
with:
4444
changes: ${{ needs.detect_changes.outputs.filters }}
45-
merge_ref: ''
4645

4746
e2e:
4847
needs: build
@@ -56,4 +55,3 @@ jobs:
5655
name: Intel GEN12 Graphics with Level Zero
5756
runner: '["Windows","gen12"]'
5857
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
59-
merge_ref: ''

0 commit comments

Comments
 (0)