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.

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

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

Merged
merged 10 commits into from
Jul 1, 2022
Prev Previous commit
ci: update ci to use updated modflow6 repo scripts
Update OneAPI installation. Update GH Actions versions for
pre-canned workflow tasks. Modified GH Actions to use standard
python instead of conda python.
  • Loading branch information
jdhughes-usgs committed Jul 1, 2022
commit e37939ac601c7b29ca543c7282f27dda54e4d1b3
1 change: 1 addition & 0 deletions .github/intel-scripts/build_windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ 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 "C:\Program Files (x86)\Intel\oneAPI\compiler\%LATEST_VERSION%\env\vars.bat"
echo %ONEAPI_ROOT%
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/nightly-build-intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ jobs:

- name: Move the build zip file
run: |
ls -l ./modflow6/distribution/
ls -l ./modflow6/distribution/temp_zip/
ls -l ./modflow6/distribution/*
mv ./modflow6/distribution/temp_zip/${{ matrix.artifact_name }} ./${{ matrix.artifact_name }}
ls -l ./

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ jobs:

- name: Move the build zip file
run: |
ls -l ./modflow6/distribution/
ls -l ./modflow6/distribution/temp_zip/
ls -l ./modflow6/distribution/*
mv ./modflow6/distribution/temp_zip/${{ matrix.artifact_name }} ./${{ matrix.artifact_name }}
ls -l ./

2 changes: 1 addition & 1 deletion .github/workflows/nightly-distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
artifact_name: Linux.zip
- os: macos-latest
artifact_name: macOS.zip
- os: windows-2019
- os: windows-latest
artifact_name: Windows.zip
defaults:
run:
Expand Down