test

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

.github/workflows/sycl-windows-build.yml

@@ -74,11 +74,16 @@ jobs:
     outputs:
       build_conclusion: ${{ steps.build.conclusion }}
     steps:
+    - uses: actions/checkout@v4
+      with:
+        path: src
+        ref: ${{ inputs.build_ref || github.sha }}
+        fetch-depth: 1
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
       with:
         arch: amd64
     - name: Setup oneAPI env
-      uses: ./.github/workflows/sycl-windows-setup-oneapi-env.yml
+      uses: ./src/devops/actions/setup_windows_oneapi_env
       if: ${{ always() && !cancelled() && inputs.compiler == 'icx' }}
       with:
         runner: ${{ runner.name }}
@@ -89,11 +94,6 @@ jobs:
         echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "CCACHE_DIR=D:\github\_work\cache\${{ inputs.build_cache_suffix }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         echo "CCACHE_MAXSIZE=10G" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-    - uses: actions/checkout@v4
-      with:
-        path: src
-        ref: ${{ inputs.build_ref || github.sha }}
-        fetch-depth: 1
     - name: Register cleanup after job is finished
       uses: ./src/devops/actions/cleanup
     - name: Configure

.github/workflows/sycl-windows-run-tests.yml

@@ -47,11 +47,17 @@ jobs:
     environment: WindowsCILock
     env: ${{ fromJSON(inputs.env) }}
     steps:
+    # TODO: use cached_checkout
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+        ref: ${{ inputs.ref || github.sha }}
+        path: llvm
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
       with:
         arch: amd64
     - name: Setup oneAPI env
-      uses: ./.github/workflows/sycl-windows-setup-oneapi-env.yml
+      uses: ./llvm/devops/actions/setup_windows_oneapi_env
       if: ${{ always() && !cancelled() && inputs.compiler == 'icx' }}
       with:
         runner: ${{ inputs.runner }}
@@ -60,12 +66,6 @@ jobs:
         git config --system core.longpaths true
         git config --global core.autocrlf false
         echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      # TODO: use cached_checkout
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-        ref: ${{ inputs.ref || github.sha }}
-        path: llvm
     - name: Register cleanup after job is finished
       uses: ./llvm/devops/actions/cleanup
     - name: Download compiler toolchain

.github/workflows/sycl-windows-setup-oneapi-env.yml renamed to devops/actions/setup_windows_oneapi_env/action.yml

@@ -1,17 +1,8 @@
-name: SYCL Windows setup oneAPI env
+name: Windows setup oneAPI env
 
-on:
-  workflow_call:
-    inputs:
-      runner:
-        description: 'The runner name'
-        required: true
-        type: string
-
-jobs:
-  set-env-vars-job:
-    runs-on: ${{ fromJSON(inputs.runner) }}
-    steps:
+runs:
+  using: "composite"
+  steps:
     - name: Setup oneAPI env
       shell: powershell
       run: |