Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: update ci to use updated modflow6 repo scripts #16

Merged
merged 10 commits into from
Jul 1, 2022
Merged

ci: update ci to use updated modflow6 repo scripts #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
399220e
ci: update ci to use updated modflow6 repo scripts
jdhughes-usgs Jun 30, 2022
fc00af1
ci: update ci to use updated modflow6 repo scripts
jdhughes-usgs Jun 30, 2022
9ae022c
ci: update ci to use updated modflow6 repo scripts
jdhughes-usgs Jun 30, 2022
dc4723e
ci: update ci to use updated modflow6 repo scripts
jdhughes-usgs Jun 30, 2022
0583296
ci: update ci to use updated modflow6 repo scripts
jdhughes-usgs Jul 1, 2022
bec4dfd
ci: update ci to use updated modflow6 repo scripts
jdhughes-usgs Jul 1, 2022
0e008e3
ci: update ci to use updated modflow6 repo scripts
jdhughes-usgs Jul 1, 2022
0946d02
ci: update ci to use updated modflow6 repo scripts
jdhughes-usgs Jul 1, 2022
de494dd
ci: update ci to use updated modflow6 repo scripts
jdhughes-usgs Jul 1, 2022
e37939a
ci: update ci to use updated modflow6 repo scripts
jdhughes-usgs Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/common/install-python-std.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

pip install wheel
pip install requests appdirs numpy matplotlib pytest pytest-xdist meson ninja
pip install https://github.com/modflowpy/flopy/zipball/develop
pip install https://github.com/modflowpy/pymake/zipball/master
11 changes: 2 additions & 9 deletions .github/intel-scripts/ifortvars_windows.bat → .github/intel-scripts/build_windows.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,12 @@ REM SPDX-FileCopyrightText: 2020 Intel Corporation
REM
REM SPDX-License-Identifier: MIT

set LANGUAGE=%1
set VS_VER=%2
@call "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat" %VS_VER%

IF "%VS_VER%"=="2017_build_tools" (
@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
)

IF "%VS_VER%"=="2019_build_tools" (
@call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
)
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 "C:\Program Files (x86)\Intel\oneAPI\compiler\%LATEST_VERSION%\env\vars.bat"
echo %ONEAPI_ROOT%
Expand Down
15 changes: 8 additions & 7 deletions .github/intel-scripts/install_windows.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
REM SPDX-FileCopyrightText: 2020 Intel Corporation
REM SPDX-FileCopyrightText: 2022 Intel Corporation
REM
REM SPDX-License-Identifier: MIT

set URL=%1
set COMPONENTS=%2

curl.exe --output webimage.exe --url %URL% --retry 5 --retry-delay 5
start /b /wait webimage.exe -s -x -f webimage_extracted --log extract.log
del webimage.exe
curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5
start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log
del %TEMP%\webimage.exe
if "%COMPONENTS%"=="" (
webimage_extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
webimage_extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=.
) else (
webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
)
webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=.
)
rd /s/q "webimage_extracted"
Loading