Skip to content

Commit

Permalink
Sync fork (#8)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
3 people committed Jun 11, 2024
1 parent 744d302 commit 5436f77
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
1 change: 0 additions & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion setup-fortran.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
}

Expand Down

0 comments on commit 5436f77

Please sign in to comment.