Merge branch 'main' into alan/OR-636_sycl_cts_testing

uxlfoundation · Dec 12, 2024 · 55c96a3 · 55c96a3
2 parents d86e0f2 + e53677a
commit 55c96a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml
@@ -25,10 +25,6 @@ on:
         default: true
 permissions: {}
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
 
   # build and run host x86_64, execute UnitCL and lit tests and build and run offline

diff --git a/.github/workflows/run_pr_tests_caller.yml b/.github/workflows/run_pr_tests_caller.yml
@@ -23,21 +23,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run-with-pull:
-    name: Call PR testing on pull request
-    if: ${{ github.event_name == 'pull_request' }}
-    uses: ./.github/workflows/run_pr_tests.yml
-    with:
-      update_cache: false
-      is_pull_request: true
-
-  # Could have multiple here
-  run-with-cron:
+  run-prs:
     name: Call PR testing on schedule
-    if: ${{ github.event_name == 'schedule' && github.repository == 'uxlfoundation/oneapi-construction-kit'}}
+    if: ${{ (github.event_name == 'schedule' && github.repository == 'uxlfoundation/oneapi-construction-kit') || github.event_name == 'pull_request' }}
     uses: ./.github/workflows/run_pr_tests.yml
     with:
-      update_cache: true
-      is_pull_request: false
+      update_cache: ${{ github.event_name == 'schedule' }}
+      is_pull_request:  ${{ github.event_name != 'schedule' }}
 
 # additional ones here for cron and/or push to main - also can be in different file.