From 07f8395846e6573aae1d52c8b39f9fb4c3a5ca13 Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Thu, 11 Aug 2022 15:34:20 -0700 Subject: [PATCH 1/2] [CI][NFC] Rename workflow job Just pure renaming of "resolve test matrix" to "generate testing matrix" Follow up on a comment made at https://github.com/intel/llvm/pull/6528 --- ...olve_test_matrix.yml => sycl_gen_test_matrix.yml} | 8 ++++---- .github/workflows/sycl_nightly.yml | 10 +++++----- .github/workflows/sycl_post_commit.yml | 12 ++++++------ .github/workflows/sycl_precommit.yml | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-) rename .github/workflows/{sycl_resolve_test_matrix.yml => sycl_gen_test_matrix.yml} (91%) diff --git a/.github/workflows/sycl_resolve_test_matrix.yml b/.github/workflows/sycl_gen_test_matrix.yml similarity index 91% rename from .github/workflows/sycl_resolve_test_matrix.yml rename to .github/workflows/sycl_gen_test_matrix.yml index 46cfbc3dbc864..6c8a5b6832bc4 100644 --- a/.github/workflows/sycl_resolve_test_matrix.yml +++ b/.github/workflows/sycl_gen_test_matrix.yml @@ -27,13 +27,13 @@ on: outputs: lts_matrix: description: "Generated Matrix" - value: ${{ jobs.resolve_matrix.outputs.lts_matrix }} + value: ${{ jobs.testing_matrix.outputs.lts_matrix }} lts_aws_matrix: description: "Generated Matrix AWS subset" - value: ${{ jobs.resolve_matrix.outputs.lts_aws_matrix }} + value: ${{ jobs.testing_matrix.outputs.lts_aws_matrix }} jobs: - resolve_matrix: - name: Resolve Test Matrix + testing_matrix: + name: Generate Testing Matrix runs-on: ubuntu-latest outputs: lts_matrix: ${{ steps.work.outputs.lts_matrix }} diff --git a/.github/workflows/sycl_nightly.yml b/.github/workflows/sycl_nightly.yml index 9299ac11ad490..d03a2b8b36025 100644 --- a/.github/workflows/sycl_nightly.yml +++ b/.github/workflows/sycl_nightly.yml @@ -10,16 +10,16 @@ on: - '.github/workflows/sycl_nightly.yml' jobs: - resolve_matrix: - name: Resolve Test Matrix - uses: ./.github/workflows/sycl_resolve_test_matrix.yml + testing_matrix: + name: Generate Testing Matrix + uses: ./.github/workflows/sycl_gen_test_matrix.yml with: lts_config: "ocl_gen9;ocl_x64" ubuntu2004_build_test: if: github.repository == 'intel/llvm' uses: ./.github/workflows/sycl_linux_build_and_test.yml - needs: resolve_matrix + needs: testing_matrix secrets: inherit with: build_cache_root: "/__w/" @@ -29,7 +29,7 @@ jobs: ubuntu2004_opaque_pointers_build_test: if: github.repository == 'intel/llvm' uses: ./.github/workflows/sycl_linux_build_and_test.yml - needs: resolve_matrix + needs: testing_matrix secrets: inherit with: build_cache_root: "/__w/" diff --git a/.github/workflows/sycl_post_commit.yml b/.github/workflows/sycl_post_commit.yml index cef878bb8331d..82dbaef385c47 100644 --- a/.github/workflows/sycl_post_commit.yml +++ b/.github/workflows/sycl_post_commit.yml @@ -12,21 +12,21 @@ on: jobs: # This job generates matrix of tests for LLVM Test Suite - resolve_matrix: - name: Resolve Test Matrix - uses: ./.github/workflows/sycl_resolve_test_matrix.yml + testing_matrix: + name: Generate Testing Matrix + uses: ./.github/workflows/sycl_gen_test_matrix.yml with: lts_config: "l0_gen9" linux_default: name: Linux Default - needs: resolve_matrix + needs: testing_matrix uses: ./.github/workflows/sycl_linux_build_and_test.yml secrets: inherit with: build_cache_root: "/__w/llvm" build_artifact_suffix: "post_commit" - lts_matrix: ${{ needs.resolve_matrix.outputs.lts_matrix }} - lts_aws_matrix: ${{ needs.resolve_matrix.outputs.lts_aws_matrix }} + lts_matrix: ${{ needs.testing_matrix.outputs.lts_matrix }} + lts_aws_matrix: ${{ needs.testing_matrix.outputs.lts_aws_matrix }} linux_no_assert: name: Linux (no assert) uses: ./.github/workflows/sycl_linux_build_and_test.yml diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index df8ea5f851bb3..a378dc41af693 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -35,9 +35,9 @@ jobs: uses: ./devops/actions/clang-format # This job generates matrix of tests for LLVM Test Suite - resolve_matrix: - name: Resolve Test Matrix - uses: ./.github/workflows/sycl_resolve_test_matrix.yml + testing_matrix: + name: Generate Testing Matrix + uses: ./.github/workflows/sycl_gen_test_matrix.yml with: lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda" @@ -45,7 +45,7 @@ jobs: name: Linux # Only build and test patches, that have passed all linter checks, because # the next commit is likely to be a follow-up on that job. - needs: [lint, resolve_matrix] + needs: [lint, testing_matrix] if: always() && (success() || contains(github.event.pull_request.labels.*.name, 'ignore-lint')) uses: ./.github/workflows/sycl_linux_build_and_test.yml secrets: inherit @@ -55,5 +55,5 @@ jobs: build_cache_size: "8G" build_artifact_suffix: "default" build_cache_suffix: "default" - lts_matrix: ${{ needs.resolve_matrix.outputs.lts_matrix }} - lts_aws_matrix: ${{ needs.resolve_matrix.outputs.lts_aws_matrix }} + lts_matrix: ${{ needs.testing_matrix.outputs.lts_matrix }} + lts_aws_matrix: ${{ needs.testing_matrix.outputs.lts_aws_matrix }} From f9b48dffd45718ffaaff1743bdda350b79be1bc8 Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Thu, 18 Aug 2022 13:05:15 -0700 Subject: [PATCH 2/2] s/testing/test/ --- .github/workflows/sycl_gen_test_matrix.yml | 8 ++++---- .github/workflows/sycl_nightly.yml | 8 ++++---- .github/workflows/sycl_post_commit.yml | 10 +++++----- .github/workflows/sycl_precommit.yml | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/sycl_gen_test_matrix.yml b/.github/workflows/sycl_gen_test_matrix.yml index 6c8a5b6832bc4..dc80bd1ae67b9 100644 --- a/.github/workflows/sycl_gen_test_matrix.yml +++ b/.github/workflows/sycl_gen_test_matrix.yml @@ -27,13 +27,13 @@ on: outputs: lts_matrix: description: "Generated Matrix" - value: ${{ jobs.testing_matrix.outputs.lts_matrix }} + value: ${{ jobs.test_matrix.outputs.lts_matrix }} lts_aws_matrix: description: "Generated Matrix AWS subset" - value: ${{ jobs.testing_matrix.outputs.lts_aws_matrix }} + value: ${{ jobs.test_matrix.outputs.lts_aws_matrix }} jobs: - testing_matrix: - name: Generate Testing Matrix + test_matrix: + name: Generate Test Matrix runs-on: ubuntu-latest outputs: lts_matrix: ${{ steps.work.outputs.lts_matrix }} diff --git a/.github/workflows/sycl_nightly.yml b/.github/workflows/sycl_nightly.yml index d03a2b8b36025..1e2880134113e 100644 --- a/.github/workflows/sycl_nightly.yml +++ b/.github/workflows/sycl_nightly.yml @@ -10,8 +10,8 @@ on: - '.github/workflows/sycl_nightly.yml' jobs: - testing_matrix: - name: Generate Testing Matrix + test_matrix: + name: Generate Test Matrix uses: ./.github/workflows/sycl_gen_test_matrix.yml with: lts_config: "ocl_gen9;ocl_x64" @@ -19,7 +19,7 @@ jobs: ubuntu2004_build_test: if: github.repository == 'intel/llvm' uses: ./.github/workflows/sycl_linux_build_and_test.yml - needs: testing_matrix + needs: test_matrix secrets: inherit with: build_cache_root: "/__w/" @@ -29,7 +29,7 @@ jobs: ubuntu2004_opaque_pointers_build_test: if: github.repository == 'intel/llvm' uses: ./.github/workflows/sycl_linux_build_and_test.yml - needs: testing_matrix + needs: test_matrix secrets: inherit with: build_cache_root: "/__w/" diff --git a/.github/workflows/sycl_post_commit.yml b/.github/workflows/sycl_post_commit.yml index 82dbaef385c47..0ac9490e7bdf2 100644 --- a/.github/workflows/sycl_post_commit.yml +++ b/.github/workflows/sycl_post_commit.yml @@ -12,21 +12,21 @@ on: jobs: # This job generates matrix of tests for LLVM Test Suite - testing_matrix: - name: Generate Testing Matrix + test_matrix: + name: Generate Test Matrix uses: ./.github/workflows/sycl_gen_test_matrix.yml with: lts_config: "l0_gen9" linux_default: name: Linux Default - needs: testing_matrix + needs: test_matrix uses: ./.github/workflows/sycl_linux_build_and_test.yml secrets: inherit with: build_cache_root: "/__w/llvm" build_artifact_suffix: "post_commit" - lts_matrix: ${{ needs.testing_matrix.outputs.lts_matrix }} - lts_aws_matrix: ${{ needs.testing_matrix.outputs.lts_aws_matrix }} + lts_matrix: ${{ needs.test_matrix.outputs.lts_matrix }} + lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }} linux_no_assert: name: Linux (no assert) uses: ./.github/workflows/sycl_linux_build_and_test.yml diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index a378dc41af693..f306b2c0e93e3 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -35,8 +35,8 @@ jobs: uses: ./devops/actions/clang-format # This job generates matrix of tests for LLVM Test Suite - testing_matrix: - name: Generate Testing Matrix + test_matrix: + name: Generate Test Matrix uses: ./.github/workflows/sycl_gen_test_matrix.yml with: lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda" @@ -45,7 +45,7 @@ jobs: name: Linux # Only build and test patches, that have passed all linter checks, because # the next commit is likely to be a follow-up on that job. - needs: [lint, testing_matrix] + needs: [lint, test_matrix] if: always() && (success() || contains(github.event.pull_request.labels.*.name, 'ignore-lint')) uses: ./.github/workflows/sycl_linux_build_and_test.yml secrets: inherit @@ -55,5 +55,5 @@ jobs: build_cache_size: "8G" build_artifact_suffix: "default" build_cache_suffix: "default" - lts_matrix: ${{ needs.testing_matrix.outputs.lts_matrix }} - lts_aws_matrix: ${{ needs.testing_matrix.outputs.lts_aws_matrix }} + lts_matrix: ${{ needs.test_matrix.outputs.lts_matrix }} + lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}