ci(win): simplify parallel actions

hyoklee · Apr 19, 2024 · 14bff85 · 14bff85
1 parent 2ba1780
commit 14bff85
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 29 deletions.
diff --git a/.github/workflows/win-ninja-icx-f-p.yml b/.github/workflows/win-ninja-icx-f-p.yml
@@ -9,39 +9,27 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - name: Install CMake and Ninja
+      - name: cmake
         uses: lukka/get-cmake@latest
-        with:
-          cmakeVersion: "3.27.6"
-      - name: Install LLVM and Clang
-        uses: KyleMayes/install-llvm-action@v2
-        with:
-          version: "15"
-      - name: Install Intel OneAPI
+      - name: oneapi
         uses: awvwgk/setup-fortran@main
         with:
           compiler: intel
           version: '2024.1'
-      - name: Install Intel MPI
+      - name: mpi
         uses: mpi4py/setup-mpi@master
         with:
           mpi: intelmpi
-      - name: Checkout HDF5
+      - name: checkout
         uses: actions/[email protected]
-      - name: Set oneAPI
-        shell: cmd
-        run: |
-          "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
-      - name: Set MPI
+      - name: set
         shell: cmd
         run: |
-          "C:\Program Files (x86)\Intel\oneAPI\mpi\latest\env\vars.bat"
-      - name: Configure & Build & Test
+          "C:/Program Files (x86)/Intel/oneAPI/mpi/latest/env/vars.bat"
+      - name: test
         shell: cmd
         run: |
-          cd hdf5
           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" -DBUILD_SHARED_LIBS:BOOL=OFF -DHDF5_BUILD_FORTRAN:BOOL=ON -DHDF5_ENABLE_PARALLEL:BOOL=ON -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF ..
-          ninja
-          ninja test
+          cmake -G Ninja -DHDF5_BUILD_FORTRAN:BOOL=ON -DHDF5_ENABLE_PARALLEL:BOOL=ON -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF -DMPIEXEC_EXECUTABLE:FILEPATH="C:\Program Files (x86)\Intel\oneAPI\mpi\2021.12\bin\mpiexec.exe" -DMPI_C_HEADER_DIR:PATH="C:\Program Files (x86)\Intel\oneAPI\mpi\2021.12\include" -DCTEST_DROP_SITE_INIT=my.cdash.org -DSITE=win -DBUILDNAME="ninja/icx/+f/+p" ..
+          ctest -D Experimental -C Release	  
diff --git a/.github/workflows/win-ninja-icx-p.yml b/.github/workflows/win-ninja-icx-p.yml
@@ -6,28 +6,29 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - name: Install CMake and Ninja
+      - name: cmake
         uses: lukka/get-cmake@latest
-      - name: Install Intel OneAPI
+      - name: oneapi
         uses: awvwgk/setup-fortran@main
         with:
           compiler: intel
           version: '2024.1'
-      - name: Install Intel MPI
+      - name: mpi
         uses: mpi4py/setup-mpi@master
         with:
           mpi: intelmpi
-      - name: Checkout HDF5
+      - name: checkout
         uses: actions/[email protected]
-      - name: Set MPI
+      - name: set
         shell: cmd
         run: |
           "C:/Program Files (x86)/Intel/oneAPI/mpi/latest/env/vars.bat"
-      - name: Configure
+      - name: test
         shell: cmd
         run: |
           set LIB=C:\Program Files (x86)\Intel\oneAPI\mpi\2021.12\lib;%LIB%
+          set
           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" ..
-          ctest -D Nightly -C Release
+          cmake -G Ninja -DHDF5_ENABLE_PARALLEL:BOOL=ON -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF  -DMPIEXEC_EXECUTABLE:FILEPATH="C:\Program Files (x86)\Intel\oneAPI\mpi\2021.12\bin\mpiexec.exe" -DMPI_C_HEADER_DIR:PATH="C:\Program Files (x86)\Intel\oneAPI\mpi\2021.12\include" -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF -DCTEST_DROP_SITE_INIT=my.cdash.org -DSITE=win -DBUILDNAME="ninja/icx/+p" ..
+          ctest -D Experimental -C Release