From ea83365446a5630c10aa4bae29966b4ec9060819 Mon Sep 17 00:00:00 2001
From: "H. Joe Lee" <hyoklee@hdfgroup.org>
Date: Wed, 17 Apr 2024 23:47:39 -0500
Subject: [PATCH] ci(oneAPI): fix yml

---
 .github/workflows/win-ninja-icx-f-p.yml |  2 +-
 .github/workflows/win-ninja-icx-p.yml   | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/win-ninja-icx-f-p.yml b/.github/workflows/win-ninja-icx-f-p.yml
index fe9c8aa9b3e..a607a399124 100644
--- a/.github/workflows/win-ninja-icx-f-p.yml
+++ b/.github/workflows/win-ninja-icx-f-p.yml
@@ -23,7 +23,7 @@ jobs:
           compiler: intel
           version: '2024.1'
       - name: Install Intel MPI
-        uses: mpi4py/setup-mpi@v1
+        uses: mpi4py/setup-mpi@master
         with:
           mpi: intelmpi
       - name: Checkout HDF5
diff --git a/.github/workflows/win-ninja-icx-p.yml b/.github/workflows/win-ninja-icx-p.yml
index bdb0ccb1ac2..5b7e8ad643b 100644
--- a/.github/workflows/win-ninja-icx-p.yml
+++ b/.github/workflows/win-ninja-icx-p.yml
@@ -8,33 +8,25 @@ jobs:
     steps:
       - name: Install CMake and Ninja
         uses: lukka/get-cmake@latest
-      - name: Install LLVM and Clang
-        uses: KyleMayes/install-llvm-action@v2
-        with:
-          version: "18.1.3"
       - name: Install Intel OneAPI
         uses: awvwgk/setup-fortran@main
         with:
           compiler: intel
           version: '2024.1'
       - name: Install Intel MPI
-        uses: mpi4py/setup-mpi@v1
+        uses: mpi4py/setup-mpi@master
         with:
           mpi: intelmpi
       - name: Checkout HDF5
         uses: actions/checkout@v4.1.1
-      - name: Set oneAPI
-        shell: cmd
-        run: |
-          "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
       - name: Set MPI
         shell: cmd
         run: |
-          "C:\Program Files (x86)\Intel\oneAPI\mpi\latest\env\vars.bat"
+          "C:/Program Files (x86)/Intel/oneAPI/mpi/latest/env/vars.bat"
       - name: Configure & Build & Test
         shell: cmd
         run: |
-          cd hdf5
+          set LIB=C:\Program Files (x86)\Intel\oneAPI\mpi\2021.12\lib;%LIB%
           mkdir build
           cd build
           cmake -G Ninja -DCMAKE_C_COMPILER="C:/Program Files (x86)/Intel/oneAPI/mpi/latest/bin/mpicc.bat" -DCMAKE_Fortran_COMPILER="C:/Program Files (x86)/Intel/oneAPI/mpi/latest/bin/mpiifort.bat" -DHDF5_ENABLE_PARALLEL:BOOL=ON -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF -DCTEST_DROP_SITE_INIT=my.cdash.org -DSITE=win -DBUILDNAME="ninja/icx/+p" ..