Skip to content

Commit

Permalink
ci: update windows configuration for gfortran builds (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
jdhughes-usgs authored Jul 1, 2022
1 parent 6236680 commit 2704839
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .github/common/link-gfortranlib5.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#! /bin/bash

FCDIR=/c/ProgramData/Chocolatey/bin
LNDIR=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin
if [ -d "$FCDIR" ] && [ -f "$LNDIR/libgfortran-5.dll" ] && [ ! -f "$FCDIR/libgfortran-5.dll" ]; then
ln -s "$LNDIR/libgfortran-5.dll" "$FCDIR/libgfortran-5.dll"
fi
6 changes: 3 additions & 3 deletions .github/intel-scripts/build_windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ REM SPDX-License-Identifier: MIT
for /f "tokens=* usebackq" %%f in (`dir /b "C:\Program Files (x86)\Intel\oneAPI\compiler\" ^| findstr /V latest ^| sort`) do @set "LATEST_VERSION=%%f"
@call "C:\Program Files (x86)\Intel\oneAPI\compiler\%LATEST_VERSION%\env\vars.bat"

echo %VS_VER%
echo %LATEST_VERSION%
echo "Visual Studio Version: %VS_VER%"
echo "OneAPI version: %LATEST_VERSION%"
echo "C:\Program Files (x86)\Intel\oneAPI\compiler\%LATEST_VERSION%\env\vars.bat"
echo %ONEAPI_ROOT%
echo "OneAPI root directory: %ONEAPI_ROOT%"
where ifort.exe
13 changes: 9 additions & 4 deletions .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- os: macos-latest
artifact_name: mac.zip
body_name: bodyFileMac
- os: windows-2019
- os: windows-latest
artifact_name: win64.zip
body_name: bodyFileWindows
defaults:
Expand All @@ -50,6 +50,11 @@ jobs:
run: |
pip list
- name: Workaround for windows-2022 v20220626.1 gfortran executable run failures
if: runner.os == 'Windows'
run: |
.github/common/link-gfortranlib5.sh
- name: Setup symbolic link to gfortran on Linux
if: runner.os == 'Linux'
run: |
Expand All @@ -60,9 +65,9 @@ jobs:
- name: Setup symbolic link to gfortran on macOS
if: runner.os == 'macOS'
run: |
sudo ln -fs /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
sudo ln -fs /usr/local/bin/gcc-10 /usr/local/bin/gcc
sudo ln -fs /usr/local/bin/g++-10 /usr/local/bin/g++
sudo ln -fs /usr/local/bin/gfortran-11 /usr/local/bin/gfortran
sudo ln -fs /usr/local/bin/gcc-11 /usr/local/bin/gcc
sudo ln -fs /usr/local/bin/g++-11 /usr/local/bin/g++
- name: Print GNU compiler versions
shell: bash
Expand Down

0 comments on commit 2704839

Please sign in to comment.