Skip to content

Commit 0811ef2

Browse files
authored
[CI] Remove useless always() (#20793)
Follow-up to #20587
1 parent 2fea9b6 commit 0811ef2

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

devops/actions/run-tests/cts/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ runs:
6868
ninja -C build-cts -k0 $( [ -n "$CTS_TESTS_TO_BUILD" ] && echo "$CTS_TESTS_TO_BUILD" || echo "test_conformance")
6969
7070
- name: Pack SYCL-CTS binaries
71-
if: always() && !cancelled() && inputs.testing_mode == 'build-only'
71+
if: ${{ !cancelled() && inputs.testing_mode == 'build-only' }}
7272
shell: bash
7373
run: tar -I 'zstd -9' -cf sycl_cts_bin.tar.zst -C ./build-cts/bin .
7474

7575
- name: Upload SYCL-CTS binaries
76-
if: always() && !cancelled() && inputs.testing_mode == 'build-only'
76+
if: ${{ !cancelled() && inputs.testing_mode == 'build-only' }}
7777
uses: actions/upload-artifact@v4
7878
with:
7979
name: ${{ inputs.binaries_artifact }}
@@ -95,7 +95,7 @@ runs:
9595
9696
- name: SYCL CTS List devices
9797
# Proceed with execution even if the 'build' step did not succeed.
98-
if: (always() && !cancelled()) && inputs.testing_mode != 'build-only'
98+
if: ${{ !cancelled()) && inputs.testing_mode != 'build-only' }}
9999
shell: bash
100100
env:
101101
ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }}
@@ -129,7 +129,7 @@ runs:
129129
130130
- name: Run SYCL CTS tests
131131
# Proceed with execution even if the previous two steps did not succeed.
132-
if: (always() && !cancelled()) && inputs.testing_mode != 'build-only'
132+
if: ${{ !cancelled()) && inputs.testing_mode != 'build-only' }}
133133
env:
134134
ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }}
135135
# By-default GitHub actions execute the "run" shell script with -e option,

devops/actions/run-tests/e2e/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ runs:
9595
exit 1
9696
9797
- name: Pack E2E binaries
98-
if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}}
98+
if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }}
9999
shell: bash
100100
run: |
101101
tar -I 'zstd -9' -cf e2e_binaries.tar.zst -C ./build-e2e .
102102
- name: Upload E2E binaries
103-
if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}}
103+
if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }}
104104
uses: actions/upload-artifact@v4
105105
with:
106106
name: ${{ inputs.binaries_artifact }}

devops/actions/run-tests/windows/cts/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ runs:
7070
ninja -C build-cts -k0 $( [ -n "$CTS_TESTS_TO_BUILD" ] && echo "$CTS_TESTS_TO_BUILD" || echo "test_conformance")
7171
7272
- name: Pack SYCL-CTS binaries
73-
if: always() && !cancelled() && inputs.testing_mode == 'build-only'
73+
if: ${{ !cancelled() && inputs.testing_mode == 'build-only' }}
7474
shell: bash
7575
run: tar -I 'zstd -9' -cf sycl_cts_bin.tar.zst -C ./build-cts/bin .
7676

7777
- name: Upload SYCL-CTS binaries
78-
if: always() && !cancelled() && inputs.testing_mode == 'build-only'
78+
if: ${{ !cancelled() && inputs.testing_mode == 'build-only' }}
7979
uses: actions/upload-artifact@v4
8080
with:
8181
name: ${{ inputs.binaries_artifact }}
@@ -97,7 +97,7 @@ runs:
9797
9898
- name: SYCL CTS List devices
9999
# Proceed with execution even if the 'build' step did not succeed.
100-
if: (always() && !cancelled()) && inputs.testing_mode != 'build-only'
100+
if: ${{ !cancelled()) && inputs.testing_mode != 'build-only' }}
101101
shell: bash
102102
env:
103103
ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }}
@@ -131,7 +131,7 @@ runs:
131131
132132
- name: Run SYCL CTS tests
133133
# Proceed with execution even if the previous two steps did not succeed.
134-
if: (always() && !cancelled()) && inputs.testing_mode != 'build-only'
134+
if: ${{ !cancelled()) && inputs.testing_mode != 'build-only' }}
135135
env:
136136
ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }}
137137
# By-default GitHub actions execute the "run" shell script with -e option,

devops/actions/run-tests/windows/e2e/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ runs:
6767
cmake -GNinja -B build-e2e -S./llvm/sycl/test-e2e -DCMAKE_CXX_COMPILER="${{ inputs.sycl_compiler || '$(which clang++).exe' }}" -DLEVEL_ZERO_LIBS_DIR="D:\\github\\level-zero_win-sdk\\lib" -DLEVEL_ZERO_INCLUDE="D:\\github\\level-zero_win-sdk\\include" -DLLVM_LIT="..\\llvm\\llvm\\utils\\lit\\lit.py" ${{ steps.cmake_opts.outputs.opts }}
6868
6969
- name: Keep track of files after configuring E2E step
70-
if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}}
70+
if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }}
7171
shell: bash
7272
run: ls build-e2e > e2econf_files.txt
7373

@@ -103,19 +103,19 @@ runs:
103103
# CMake issues related to absolute paths we reconfigure the build-e2e
104104
# folder on the run system.
105105
- name: Remove E2E configuration files
106-
if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}}
106+
if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }}
107107
shell: bash
108108
run: |
109109
for FILE in $(cat e2econf_files.txt); do rm -r build-e2e/$FILE; done
110110
rm e2econf_files.txt
111111
112112
- name: Pack E2E test binaries
113-
if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}}
113+
if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }}
114114
shell: bash
115115
run: |
116116
tar -czf e2e_bin.tar.gz -C build-e2e .
117117
- name: Upload E2E test binaries
118-
if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}}
118+
if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }}
119119
uses: actions/upload-artifact@v4
120120
with:
121121
name: ${{ inputs.binaries_artifact }}

0 commit comments

Comments
 (0)