Skip to content

Commit 5436f77

Browse files
iulusoywpbonelligithub-actions[bot]
committed
Sync fork (#8)
* feat: set FPM environment variables (fortran-lang#63) * set FPM_FC/FPM_CC/FPM_CXX matching FC/CC/CXX * consolidate env var assignment in setup script * feat: support intel 2024.0 on linux and windows (fortran-lang#64) * fix(mac/gcc): always create unversioned gcc/g++/gfortran links (fortran-lang#65) * brew doesn't link gcc/g++ without version number like it does for gfortran * this was causing default mac gcc/g++ to be discovered on PATH * fix readme auto-update PR conditionals in reporting mode * Update compatibility matrix (fortran-lang#66) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * ci: don't trigger when tags are pushed (fortran-lang#67) * correct typo * fix variable name * pass cpp_name * pass cpp_name --------- Co-authored-by: wpbonelli <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 744d302 commit 5436f77

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ runs:
166166
echo fc=$FC>>$GITHUB_OUTPUT
167167
echo cc=$CC>>$GITHUB_OUTPUT
168168
echo cxx=$CXX>>$GITHUB_OUTPUT
169-
170169
- name: Hide GNU linker (Windows)
171170
if: runner.os == 'Windows' && !contains(inputs.compiler, 'gcc')
172171
shell: bash

setup-fortran.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,10 @@ intel_version_map_l()
218218
esac
219219
else
220220
case $actual_version in
221+
# 2024 versions omit patch version number in pkg name
222+
2024.0*)
223+
version=2024.0
224+
;;
221225
2022.0.0 | 2022.0)
222226
version=2022.0.2
223227
;;
@@ -342,7 +346,7 @@ intel_version_map_w()
342346
2024.1 | 2024.1.0)
343347
version=2024.1.0
344348
;;
345-
2024.0 | 2024.0.0)
349+
2024 | 2024.0 | 2024.0.1)
346350
version=2024.0.1
347351
;;
348352
2023.2 | 2023.1 | 2023.0)
@@ -409,6 +413,7 @@ install_intel_apt()
409413
export MKLLIB="$ONEAPI_ROOT/mkl/latest/lib/intel64"
410414
export MKLROOT="$ONEAPI_ROOT/mkl/latest"
411415
fi
416+
412417
export_intel_vars
413418
}
414419

0 commit comments

Comments
 (0)