From 5a3b5dd3514e5e8ccf96d19fc7bfe0532f1c6477 Mon Sep 17 00:00:00 2001 From: "Kornev, Nikita" Date: Tue, 2 Dec 2025 13:42:36 +0100 Subject: [PATCH] [CI] Remove useless always Follow-up to https://github.com/intel/llvm/pull/20587 --- devops/actions/run-tests/cts/action.yml | 8 ++++---- devops/actions/run-tests/e2e/action.yml | 4 ++-- devops/actions/run-tests/windows/cts/action.yml | 8 ++++---- devops/actions/run-tests/windows/e2e/action.yml | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/devops/actions/run-tests/cts/action.yml b/devops/actions/run-tests/cts/action.yml index 48ab02d3b67bc..67c27bfd11da5 100644 --- a/devops/actions/run-tests/cts/action.yml +++ b/devops/actions/run-tests/cts/action.yml @@ -68,12 +68,12 @@ runs: ninja -C build-cts -k0 $( [ -n "$CTS_TESTS_TO_BUILD" ] && echo "$CTS_TESTS_TO_BUILD" || echo "test_conformance") - name: Pack SYCL-CTS binaries - if: always() && !cancelled() && inputs.testing_mode == 'build-only' + if: ${{ !cancelled() && inputs.testing_mode == 'build-only' }} shell: bash run: tar -I 'zstd -9' -cf sycl_cts_bin.tar.zst -C ./build-cts/bin . - name: Upload SYCL-CTS binaries - if: always() && !cancelled() && inputs.testing_mode == 'build-only' + if: ${{ !cancelled() && inputs.testing_mode == 'build-only' }} uses: actions/upload-artifact@v4 with: name: ${{ inputs.binaries_artifact }} @@ -95,7 +95,7 @@ runs: - name: SYCL CTS List devices # Proceed with execution even if the 'build' step did not succeed. - if: (always() && !cancelled()) && inputs.testing_mode != 'build-only' + if: ${{ !cancelled()) && inputs.testing_mode != 'build-only' }} shell: bash env: ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }} @@ -129,7 +129,7 @@ runs: - name: Run SYCL CTS tests # Proceed with execution even if the previous two steps did not succeed. - if: (always() && !cancelled()) && inputs.testing_mode != 'build-only' + if: ${{ !cancelled()) && inputs.testing_mode != 'build-only' }} env: ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }} # By-default GitHub actions execute the "run" shell script with -e option, diff --git a/devops/actions/run-tests/e2e/action.yml b/devops/actions/run-tests/e2e/action.yml index 2b0564bd1bc2e..c78935eab8eb5 100644 --- a/devops/actions/run-tests/e2e/action.yml +++ b/devops/actions/run-tests/e2e/action.yml @@ -95,12 +95,12 @@ runs: exit 1 - name: Pack E2E binaries - if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}} + if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }} shell: bash run: | tar -I 'zstd -9' -cf e2e_binaries.tar.zst -C ./build-e2e . - name: Upload E2E binaries - if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}} + if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }} uses: actions/upload-artifact@v4 with: name: ${{ inputs.binaries_artifact }} diff --git a/devops/actions/run-tests/windows/cts/action.yml b/devops/actions/run-tests/windows/cts/action.yml index 6be118eee85ec..ac605bd4bacd9 100644 --- a/devops/actions/run-tests/windows/cts/action.yml +++ b/devops/actions/run-tests/windows/cts/action.yml @@ -70,12 +70,12 @@ runs: ninja -C build-cts -k0 $( [ -n "$CTS_TESTS_TO_BUILD" ] && echo "$CTS_TESTS_TO_BUILD" || echo "test_conformance") - name: Pack SYCL-CTS binaries - if: always() && !cancelled() && inputs.testing_mode == 'build-only' + if: ${{ !cancelled() && inputs.testing_mode == 'build-only' }} shell: bash run: tar -I 'zstd -9' -cf sycl_cts_bin.tar.zst -C ./build-cts/bin . - name: Upload SYCL-CTS binaries - if: always() && !cancelled() && inputs.testing_mode == 'build-only' + if: ${{ !cancelled() && inputs.testing_mode == 'build-only' }} uses: actions/upload-artifact@v4 with: name: ${{ inputs.binaries_artifact }} @@ -97,7 +97,7 @@ runs: - name: SYCL CTS List devices # Proceed with execution even if the 'build' step did not succeed. - if: (always() && !cancelled()) && inputs.testing_mode != 'build-only' + if: ${{ !cancelled()) && inputs.testing_mode != 'build-only' }} shell: bash env: ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }} @@ -131,7 +131,7 @@ runs: - name: Run SYCL CTS tests # Proceed with execution even if the previous two steps did not succeed. - if: (always() && !cancelled()) && inputs.testing_mode != 'build-only' + if: ${{ !cancelled()) && inputs.testing_mode != 'build-only' }} env: ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }} # By-default GitHub actions execute the "run" shell script with -e option, diff --git a/devops/actions/run-tests/windows/e2e/action.yml b/devops/actions/run-tests/windows/e2e/action.yml index 3564361601d91..5400db21a7cf3 100644 --- a/devops/actions/run-tests/windows/e2e/action.yml +++ b/devops/actions/run-tests/windows/e2e/action.yml @@ -67,7 +67,7 @@ runs: 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 }} - name: Keep track of files after configuring E2E step - if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}} + if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }} shell: bash run: ls build-e2e > e2econf_files.txt @@ -103,19 +103,19 @@ runs: # CMake issues related to absolute paths we reconfigure the build-e2e # folder on the run system. - name: Remove E2E configuration files - if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}} + if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }} shell: bash run: | for FILE in $(cat e2econf_files.txt); do rm -r build-e2e/$FILE; done rm e2econf_files.txt - name: Pack E2E test binaries - if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}} + if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }} shell: bash run: | tar -czf e2e_bin.tar.gz -C build-e2e . - name: Upload E2E test binaries - if: ${{ always() && !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only'}} + if: ${{ !cancelled() && inputs.binaries_artifact != '' && inputs.testing_mode != 'run-only' }} uses: actions/upload-artifact@v4 with: name: ${{ inputs.binaries_artifact }}