From 20d47f0dc4029090ebc44711a8a272d432ba8ced Mon Sep 17 00:00:00 2001 From: "Sabianin, Maksim" Date: Mon, 1 Dec 2025 07:29:35 -0800 Subject: [PATCH 1/6] [CI] Refactor cleanup of built E2E tests in precommit. --- .github/workflows/sycl-linux-build.yml | 8 -------- devops/actions/run-tests/e2e/action.yml | 3 +++ devops/actions/run-tests/windows/e2e/action.yml | 3 +++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml index 13583e7a44142..e3b350fbac3cb 100644 --- a/.github/workflows/sycl-linux-build.yml +++ b/.github/workflows/sycl-linux-build.yml @@ -339,10 +339,6 @@ jobs: sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd" - - name: Remove E2E tests before spirv-backend run - if: ${{ inputs.e2e_binaries_spirv_backend_artifact && !cancelled() && steps.build.conclusion == 'success' }} - run: rm -rf build-e2e - - name: Build E2E tests with SPIR-V Backend if: ${{ inputs.e2e_binaries_spirv_backend_artifact && !cancelled() && steps.build.conclusion == 'success' }} uses: ./devops/actions/run-tests/e2e @@ -354,10 +350,6 @@ jobs: sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ extra_lit_opts: --param spirv-backend=True - - name: Remove E2E tests before preview-mode run - if: ${{ inputs.e2e_binaries_preview_artifact && !cancelled() && steps.build.conclusion == 'success' }} - run: rm -rf build-e2e - - name: Build E2E tests in Preview Mode if: ${{ inputs.e2e_binaries_preview_artifact && !cancelled() && steps.build.conclusion == 'success' }} uses: ./devops/actions/run-tests/e2e diff --git a/devops/actions/run-tests/e2e/action.yml b/devops/actions/run-tests/e2e/action.yml index 2b0564bd1bc2e..d3cec2efd3d36 100644 --- a/devops/actions/run-tests/e2e/action.yml +++ b/devops/actions/run-tests/e2e/action.yml @@ -106,3 +106,6 @@ runs: name: ${{ inputs.binaries_artifact }} path: e2e_binaries.tar.zst retention-days: ${{ inputs.retention-days }} + - name: Cleanup E2E tests + if: {{ !cancelled() }} + run: rm -rf build-e2e diff --git a/devops/actions/run-tests/windows/e2e/action.yml b/devops/actions/run-tests/windows/e2e/action.yml index 3564361601d91..2dc4cbc6cc580 100644 --- a/devops/actions/run-tests/windows/e2e/action.yml +++ b/devops/actions/run-tests/windows/e2e/action.yml @@ -121,3 +121,6 @@ runs: name: ${{ inputs.binaries_artifact }} path: e2e_bin.tar.gz retention-days: ${{ inputs.retention-days }} + - name: Cleanup E2E tests + if: {{ !cancelled() }} + run: rm -rf build-e2e From cdb2b1fcca2f2ab1ec93310f66bf667de7367eed Mon Sep 17 00:00:00 2001 From: "Sabianin, Maksim" Date: Mon, 1 Dec 2025 08:16:21 -0800 Subject: [PATCH 2/6] fix type and add matrix --- .github/workflows/sycl-linux-build.yml | 56 +++++++++++-------------- devops/actions/run-tests/e2e/action.yml | 2 +- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml index e3b350fbac3cb..715099f557694 100644 --- a/.github/workflows/sycl-linux-build.yml +++ b/.github/workflows/sycl-linux-build.yml @@ -328,35 +328,29 @@ jobs: comm -13 env_before env_after >> $GITHUB_ENV rm env_before env_after - - name: Build E2E tests - if: ${{ inputs.e2e_binaries_artifact && !cancelled() && steps.build.conclusion == 'success' }} - uses: ./devops/actions/run-tests/e2e - with: - ref: ${{ inputs.ref || github.sha }} - testing_mode: build-only - target_devices: all - binaries_artifact: ${{ inputs.e2e_binaries_artifact }} - sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ - extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd" - - - name: Build E2E tests with SPIR-V Backend - if: ${{ inputs.e2e_binaries_spirv_backend_artifact && !cancelled() && steps.build.conclusion == 'success' }} - uses: ./devops/actions/run-tests/e2e - with: - ref: ${{ inputs.ref || github.sha }} - testing_mode: build-only - target_devices: all - binaries_artifact: ${{ inputs.e2e_binaries_spirv_backend_artifact }} - sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ - extra_lit_opts: --param spirv-backend=True + build-e2e: + name: Build E2E tests + needs: [build] + if: ${{ !cancelled() && needs.build.outputs.build_conclusion == 'success' }} + permissions: + contents: write + packages: read + strategy: + fail-fast: false + matrix: + include: + - name: Build E2E tests + extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd" + - name: Build E2E tests with SPIR-V Backend + extra_lit_opts: --param spirv-backend=True + - name: Build E2E tests in Preview Mode + extra_lit_opts: --param test-preview-mode=True - - name: Build E2E tests in Preview Mode - if: ${{ inputs.e2e_binaries_preview_artifact && !cancelled() && steps.build.conclusion == 'success' }} - uses: ./devops/actions/run-tests/e2e - with: - ref: ${{ inputs.ref || github.sha }} - testing_mode: build-only - target_devices: all - binaries_artifact: ${{ inputs.e2e_binaries_preview_artifact }} - sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ - extra_lit_opts: --param test-preview-mode=True + uses: ./devops/actions/run-tests/e2e + with: + ref: ${{ inputs.ref || github.sha }} + testing_mode: build-only + target_devices: all + binaries_artifact: ${{ matrix.binaries_artifact }} + sycl_compiler: $GITBUN_WORKSPACE/toolchain/bin/clang++ + extra_lit_opts: ${{ matrix.extra_lit_opts }} diff --git a/devops/actions/run-tests/e2e/action.yml b/devops/actions/run-tests/e2e/action.yml index d3cec2efd3d36..74625f3d942ea 100644 --- a/devops/actions/run-tests/e2e/action.yml +++ b/devops/actions/run-tests/e2e/action.yml @@ -107,5 +107,5 @@ runs: path: e2e_binaries.tar.zst retention-days: ${{ inputs.retention-days }} - name: Cleanup E2E tests - if: {{ !cancelled() }} + if: ${{ !cancelled() }} run: rm -rf build-e2e From cb6da224db5c376d67090a8633e7fe99041f667b Mon Sep 17 00:00:00 2001 From: "Sabianin, Maksim" Date: Mon, 1 Dec 2025 08:48:02 -0800 Subject: [PATCH 3/6] fix typo --- devops/actions/run-tests/windows/e2e/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/actions/run-tests/windows/e2e/action.yml b/devops/actions/run-tests/windows/e2e/action.yml index 2dc4cbc6cc580..031ec6d00dfaa 100644 --- a/devops/actions/run-tests/windows/e2e/action.yml +++ b/devops/actions/run-tests/windows/e2e/action.yml @@ -122,5 +122,5 @@ runs: path: e2e_bin.tar.gz retention-days: ${{ inputs.retention-days }} - name: Cleanup E2E tests - if: {{ !cancelled() }} + if: ${{ !cancelled() }} run: rm -rf build-e2e From 0ea1b341a69334ccf784b6a00629febaf41fc438 Mon Sep 17 00:00:00 2001 From: "Sabianin, Maksim" Date: Mon, 1 Dec 2025 10:01:55 -0800 Subject: [PATCH 4/6] fix shell and binaries_artifact path --- .github/workflows/sycl-linux-build.yml | 3 +++ devops/actions/run-tests/windows/e2e/action.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml index 715099f557694..d7789e91f3f7e 100644 --- a/.github/workflows/sycl-linux-build.yml +++ b/.github/workflows/sycl-linux-build.yml @@ -340,10 +340,13 @@ jobs: matrix: include: - name: Build E2E tests + binaries_artifact: ${{ inputs.e2e_binaries_artifact }} extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd" - name: Build E2E tests with SPIR-V Backend + binaries_artifact: ${{ inputs.e2e_binaries_spirv_backend_artifact }} extra_lit_opts: --param spirv-backend=True - name: Build E2E tests in Preview Mode + binaries_artifact: ${{ inputs.e2e_binaries_preview_artifact }} extra_lit_opts: --param test-preview-mode=True uses: ./devops/actions/run-tests/e2e diff --git a/devops/actions/run-tests/windows/e2e/action.yml b/devops/actions/run-tests/windows/e2e/action.yml index 031ec6d00dfaa..c77cf41f52e14 100644 --- a/devops/actions/run-tests/windows/e2e/action.yml +++ b/devops/actions/run-tests/windows/e2e/action.yml @@ -123,4 +123,5 @@ runs: retention-days: ${{ inputs.retention-days }} - name: Cleanup E2E tests if: ${{ !cancelled() }} + shell: bash run: rm -rf build-e2e From 22eed7833d54671fc0628f8d393d99a65518ad75 Mon Sep 17 00:00:00 2001 From: "Sabianin, Maksim" Date: Tue, 2 Dec 2025 09:24:56 -0800 Subject: [PATCH 5/6] revert matrix approach for building e2e tests --- .github/workflows/sycl-linux-build.yml | 59 ++++++++++++++------------ 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml index d7789e91f3f7e..e3b350fbac3cb 100644 --- a/.github/workflows/sycl-linux-build.yml +++ b/.github/workflows/sycl-linux-build.yml @@ -328,32 +328,35 @@ jobs: comm -13 env_before env_after >> $GITHUB_ENV rm env_before env_after - build-e2e: - name: Build E2E tests - needs: [build] - if: ${{ !cancelled() && needs.build.outputs.build_conclusion == 'success' }} - permissions: - contents: write - packages: read - strategy: - fail-fast: false - matrix: - include: - - name: Build E2E tests - binaries_artifact: ${{ inputs.e2e_binaries_artifact }} - extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd" - - name: Build E2E tests with SPIR-V Backend - binaries_artifact: ${{ inputs.e2e_binaries_spirv_backend_artifact }} - extra_lit_opts: --param spirv-backend=True - - name: Build E2E tests in Preview Mode - binaries_artifact: ${{ inputs.e2e_binaries_preview_artifact }} - extra_lit_opts: --param test-preview-mode=True + - name: Build E2E tests + if: ${{ inputs.e2e_binaries_artifact && !cancelled() && steps.build.conclusion == 'success' }} + uses: ./devops/actions/run-tests/e2e + with: + ref: ${{ inputs.ref || github.sha }} + testing_mode: build-only + target_devices: all + binaries_artifact: ${{ inputs.e2e_binaries_artifact }} + sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ + extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd" + + - name: Build E2E tests with SPIR-V Backend + if: ${{ inputs.e2e_binaries_spirv_backend_artifact && !cancelled() && steps.build.conclusion == 'success' }} + uses: ./devops/actions/run-tests/e2e + with: + ref: ${{ inputs.ref || github.sha }} + testing_mode: build-only + target_devices: all + binaries_artifact: ${{ inputs.e2e_binaries_spirv_backend_artifact }} + sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ + extra_lit_opts: --param spirv-backend=True - uses: ./devops/actions/run-tests/e2e - with: - ref: ${{ inputs.ref || github.sha }} - testing_mode: build-only - target_devices: all - binaries_artifact: ${{ matrix.binaries_artifact }} - sycl_compiler: $GITBUN_WORKSPACE/toolchain/bin/clang++ - extra_lit_opts: ${{ matrix.extra_lit_opts }} + - name: Build E2E tests in Preview Mode + if: ${{ inputs.e2e_binaries_preview_artifact && !cancelled() && steps.build.conclusion == 'success' }} + uses: ./devops/actions/run-tests/e2e + with: + ref: ${{ inputs.ref || github.sha }} + testing_mode: build-only + target_devices: all + binaries_artifact: ${{ inputs.e2e_binaries_preview_artifact }} + sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ + extra_lit_opts: --param test-preview-mode=True From 5b6e2f3336965ee39f1a8c7e7ddd45482d2197a4 Mon Sep 17 00:00:00 2001 From: "Sabianin, Maksim" Date: Tue, 2 Dec 2025 09:37:45 -0800 Subject: [PATCH 6/6] fix shell in action.yml --- devops/actions/run-tests/e2e/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devops/actions/run-tests/e2e/action.yml b/devops/actions/run-tests/e2e/action.yml index 74625f3d942ea..fe744847ba689 100644 --- a/devops/actions/run-tests/e2e/action.yml +++ b/devops/actions/run-tests/e2e/action.yml @@ -108,4 +108,6 @@ runs: retention-days: ${{ inputs.retention-days }} - name: Cleanup E2E tests if: ${{ !cancelled() }} - run: rm -rf build-e2e + shell: bash + run: | + rm -rf build-e2e