Switches windows workflow

OpenSEMBA · Nov 4, 2024 · 997ae21 · 997ae21
1 parent 5085550
commit 997ae21
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 46 deletions.
diff --git a/.github/workflows/automatic-release-windows-intelLLVM.yml b/.github/workflows/automatic-release-windows-intelLLVM.yml
@@ -11,7 +11,6 @@ on:
   push:
     branches:
       - main
-      - feature/automatic-releases
 
 jobs:
 
@@ -23,22 +22,19 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-
-    - name: cache install oneAPI
-      id: cache-install
-      uses: actions/cache@v2
+
+    - name: Setup MPI
+      uses: mpi4py/setup-mpi@v1
       with:
-        path: |
-            C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat
-            C:\Program Files (x86)\Intel\oneAPI\compiler
-        key: install-${{ env.CACHE_NUMBER }}-${{ env.WINDOWS_HPCKIT_URL }}-${{ env.WINDOWS_FORTRAN_COMPONENTS }}-compiler-${{ hashFiles('**/scripts/cache_exclude_windows.sh') }}
-
-    - name: non-cache install oneAPI
-      if: steps.cache-install.outputs.cache-hit != 'true'
-      shell: bash
-      timeout-minutes: 20
-      run: .github/workflows/install_windows.bat $WINDOWS_HPCKIT_URL
+        mpi: 'intelmpi'
 
+    - name: Setup intel fortran
+      uses: fortran-lang/setup-fortran@v1
+      id: setup-fortran
+      with:
+        compiler: intel
+        version: '2024.2'    
+
     - name: Setup ninja
       uses: seanmiddleditch/gha-setup-ninja@master
 

diff --git a/.github/workflows/ubuntu-intelLLVM.yml b/.github/workflows/ubuntu-intelLLVM.yml
@@ -38,25 +38,6 @@ jobs:
           /opt/intel/oneapi
         key: install-apt
 
-    # - name: non-cache install oneAPI
-    #   if: steps.cache-install.outputs.cache-hit != 'true'
-    #   timeout-minutes: 10
-    #   run: |
-    #     sh -c .github/workflows/oneapi_setup_apt_repo_linux.sh
-    #     sudo apt install ${{ env.LINUX_CPP_COMPONENTS }} ${{ env.LINUX_FORTRAN_COMPONENTS }}
-
-    # - name: Setup Intel oneAPI environment
-    #   run: |
-    #     LATEST_VERSION=$(ls -1 /opt/intel/oneapi/compiler/ | grep -v latest | sort | tail -1)
-    #     source /opt/intel/oneapi/compiler/"$LATEST_VERSION"/env/vars.sh
-    #     source /opt/intel/oneapi/mpi/2021.3.0/env/vars.sh
-    #     # source /opt/intel/oneapi/setvars.sh
-    #     printenv >> $GITHUB_ENV
-
-    # - name: print config log
-    #   if: ${{ failure() }}
-    #   run: cat build/CMakeFiles/CMakeConfigureLog.yaml
-
     - name: Setup MPI
       uses: mpi4py/setup-mpi@v1
       with:

diff --git a/.github/workflows/windows-intelLLVM.yml b/.github/workflows/windows-intelLLVM.yml
@@ -29,20 +29,17 @@ jobs:
       with:
         submodules: 'recursive'
 
-    - name: cache install oneAPI
-      id: cache-install
-      uses: actions/cache@v2
+    - name: Setup MPI
+      uses: mpi4py/setup-mpi@v1
       with:
-        path: |
-            C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat
-            C:\Program Files (x86)\Intel\oneAPI\compiler
-        key: install-${{ env.CACHE_NUMBER }}-${{ env.WINDOWS_HPCKIT_URL }}-${{ env.WINDOWS_FORTRAN_COMPONENTS }}-compiler-${{ hashFiles('**/scripts/cache_exclude_windows.sh') }}
+        mpi: 'intelmpi'
 
-    - name: non-cache install oneAPI
-      if: steps.cache-install.outputs.cache-hit != 'true'
-      shell: bash
-      timeout-minutes: 20
-      run: .github/workflows/install_windows.bat $WINDOWS_HPCKIT_URL
+    - name: Setup intel fortran
+      uses: fortran-lang/setup-fortran@v1
+      id: setup-fortran
+      with:
+        compiler: intel
+        version: '2024.2'
 
     - name: Setup ninja
       uses: seanmiddleditch/gha-setup-ninja@master