diff --git a/action.yml b/action.yml index 00f9d57..9067c80 100644 --- a/action.yml +++ b/action.yml @@ -166,7 +166,6 @@ runs: echo fc=$FC>>$GITHUB_OUTPUT echo cc=$CC>>$GITHUB_OUTPUT echo cxx=$CXX>>$GITHUB_OUTPUT - - name: Hide GNU linker (Windows) if: runner.os == 'Windows' && !contains(inputs.compiler, 'gcc') shell: bash diff --git a/setup-fortran.sh b/setup-fortran.sh index 0a69a23..0bb68e3 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -218,6 +218,10 @@ intel_version_map_l() esac else case $actual_version in + # 2024 versions omit patch version number in pkg name + 2024.0*) + version=2024.0 + ;; 2022.0.0 | 2022.0) version=2022.0.2 ;; @@ -342,7 +346,7 @@ intel_version_map_w() 2024.1 | 2024.1.0) version=2024.1.0 ;; - 2024.0 | 2024.0.0) + 2024 | 2024.0 | 2024.0.1) version=2024.0.1 ;; 2023.2 | 2023.1 | 2023.0) @@ -409,6 +413,7 @@ install_intel_apt() export MKLLIB="$ONEAPI_ROOT/mkl/latest/lib/intel64" export MKLROOT="$ONEAPI_ROOT/mkl/latest" fi + export_intel_vars }