Update for Intel 2023.2.0 (#25)

* Add URL for MacOS installers

* Update workflow to include Intel 2023.2.0

* Update README and setup-fortran.sh for Intel 2023.2.0 (#26)

* Update .github/workflows/test.yml

* Update .github/workflows/test.yml

* Update .github/workflows/test.yml

---------

Co-authored-by: Alexis Montoison <[email protected]>

Author: awvwgk

.github/workflows/test.yml

@@ -38,7 +38,8 @@ jobs:
           - {compiler: gcc, version:  6}
           # {compiler: gcc, version:  5}
         include:
-          - {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2023.1'}}
+          - {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2023.2'}}
+          # {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2023.1'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2023.0'}}
           - {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2022.2.1'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2022.2'}}
@@ -50,7 +51,8 @@ jobs:
           # {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2021.1.2'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2021.1'}}
 
-          - {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.9'}}
+          - {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.10'}}
+          # {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.9'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.8'}}
           - {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.7.1'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.7'}}
@@ -62,7 +64,8 @@ jobs:
           # {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.1.2'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.1'}}
 
-          - {os: macos-12, toolchain: {compiler: intel-classic, version: '2021.9'}}
+          - {os: macos-12, toolchain: {compiler: intel-classic, version: '2021.10'}}
+          # {os: macos-12, toolchain: {compiler: intel-classic, version: '2021.9'}}
           # {os: macos-12, toolchain: {compiler: intel-classic, version: '2021.8'}}
           - {os: macos-12, toolchain: {compiler: intel-classic, version: '2021.7.1'}}
           # {os: macos-12, toolchain: {compiler: intel-classic, version: '2021.7'}}

README.md

@@ -31,13 +31,13 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         toolchain:
           - {compiler: gcc, version: 11}
-          - {compiler: intel-classic, version: '2021.9'}
+          - {compiler: intel-classic, version: '2021.10'}
         include:
           - os: ubuntu-latest
-            toolchain: {compiler: intel, version: '2023.1'}
+            toolchain: {compiler: intel, version: '2023.2'}
         exclude:
           - os: windows-latest
-            toolchain: {compiler: intel-classic, version: '2021.9'}
+            toolchain: {compiler: intel-classic, version: '2021.10'}
 
     steps:
       - uses: awvwgk/setup-fortran@v1
@@ -60,8 +60,8 @@ jobs:
   - *intel-classic* (for `ifort`)
 - *version*: Version of the compiler toolchain, available options are
   - *5–13* for *gcc*
-  - *2021.1–2023.1* for *intel*
-  - *2021.1–2021.9* for *intel-classic*
+  - *2021.1–2023.2* for *intel*
+  - *2021.1–2021.10* for *intel-classic*
 
 **Note:** version 13 of the GNU toolchain is not yet available on Windows.
 
@@ -105,9 +105,9 @@ Supported Intel toolchains:
 
 | runner    | compiler       | version |
 | :-------- | :------------- | :------ |
-| ubuntu-\* | intel          | 2023.1, 2023.0, <br/> 2022.2.1, 2022.2, 2022.1, 2022.0, <br/> 2021.4, 2021.3, 2021.2, 2021.1.2, 2021.1 |
-| ubuntu-\* | intel-classic  | 2021.9, 2021.8, <br/> 2021.7.1, 2021.7, 2021.6, 2021.5, <br/> 2021.4, 2021.3, 2021.2, 2021.1.2, 2021.1 |
-| macos-\*  | intel-classic  | 2021.9, 2021.8, <br/> 2021.7.1, 2021.7, 2021.6, 2021.5, <br/> 2021.4, 2021.3, 2021.2, 2021.1 |
+| ubuntu-\* | intel          | 2023.2, 2023.1, 2023.0, <br/> 2022.2.1, 2022.2, 2022.1, 2022.0, <br/> 2021.4, 2021.3, 2021.2, 2021.1.2, 2021.1 |
+| ubuntu-\* | intel-classic  | 2021.10, 2021.9, 2021.8, <br/> 2021.7.1, 2021.7, 2021.6, 2021.5, <br/> 2021.4, 2021.3, 2021.2, 2021.1.2, 2021.1 |
+| macos-\*  | intel-classic  | 2021.10, 2021.9, 2021.8, <br/> 2021.7.1, 2021.7, 2021.6, 2021.5, <br/> 2021.4, 2021.3, 2021.2, 2021.1 |
 
 
 ## License

action.yml

@@ -37,11 +37,11 @@ runs:
             install_gcc $platform
             ;;
           intel-classic)
-            version=${VERSION:-2023.1.0}
+            version=${VERSION:-2023.2.0}
             install_intel $platform true
             ;;
           intel)
-            version=${VERSION:-2023.1.0}
+            version=${VERSION:-2023.2.0}
             install_intel $platform false
             ;;
           *)

setup-fortran.sh

@@ -143,6 +143,9 @@ intel_version_map_l()
   local classic=$2
   if $classic; then
     case $actual_version in
+      2021.10.0 | 2021.10)
+        version=2023.2.0
+        ;;
       2021.9.0 | 2021.9)
         version=2023.1.0
         ;;
@@ -177,7 +180,7 @@ intel_version_map_l()
       2022.0.0 | 2022.0)
         version=2022.0.2
         ;;
-      2023.1 | 2023.0 | 2022.2 | 2022.1 | 2021.4 | 2021.3 | 2021.2)
+      2023.2 | 2023.1 | 2023.0 | 2022.2 | 2022.1 | 2021.4 | 2021.3 | 2021.2)
         version=$actual_version.0
         ;;
       2021.1)
@@ -194,6 +197,9 @@ intel_version_map_m()
 {
   local actual_version=$1
   case $actual_version in
+    2021.10.0 | 2021.10)
+      version=2023.2.0
+      ;;
     2021.9.0 | 2021.9)
       version=2023.1.0
       ;;
@@ -300,6 +306,10 @@ install_intel_dmg()
       MACOS_BASEKIT_URL=https:/registrationcenter-download.intel.com/akdlm/IRC_NAS/2516a0a0-de4d-4f3d-9e83-545b32127dbb/m_BaseKit_p_2023.1.0.45568.dmg
       MACOS_HPCKIT_URL=https:/registrationcenter-download.intel.com/akdlm/IRC_NAS/a99cb1c5-5af6-4824-9811-ae172d24e594/m_HPCKit_p_2023.1.0.44543.dmg
       ;;
+    2023.2.0)
+      MACOS_BASEKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/cd013e6c-49c4-488b-8b86-25df6693a9b7/m_BaseKit_p_2023.2.0.49398.dmg
+      MACOS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/edb4dc2f-266f-47f2-8d56-21bc7764e119/m_HPCKit_p_2023.2.0.49443.dmg
+      ;;
     *)
       exit 1
       ;;