Skip to content
This repository has been archived by the owner on Jan 5, 2024. It is now read-only.

Commit

Permalink
debug install_windows.bat, add integration test
Browse files Browse the repository at this point in the history
  • Loading branch information
wpbonelli committed Sep 21, 2023
1 parent 7c2a056 commit 776a4f3
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 9 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ jobs:

# not needed atm, but just in case any future tests require this
- name: Set SETVARS_COMPLETED
if: matrix.setvars != 'true'
shell: bash
run: echo "SETVARS_COMPLETED=1" >> $GITHUB_ENV

Expand Down
37 changes: 34 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ on:
pull_request:
branches:
- main
- develop
- develop*
paths-ignore:
- '**.md'
schedule:
- cron: '0 6 * * *' # run at 6 AM UTC every day
jobs:
test_modflow:
name: Test modflow6 integration
test_modflow_meson:
name: Build modflow6 with meson
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand Down Expand Up @@ -132,6 +132,37 @@ jobs:
meson compile -v -C builddir
meson install -C builddir
test_modflow_msvs:
name: Build modflow6 with MSVS
runs-on: windows-2019
env:
FC: ifort
steps:

- name: Checkout modflow6
uses: actions/checkout@v4

- uses: ilammy/msvc-dev-cmd@v1
with:
vsversion: 2019

# - name: Prepare MSVC
# uses: bus1/cabuild/action/msdevshell@v1
# with:
# architecture: x64

- name: Install ifort
uses: ./
with:
vs2019: 'true'

- name: Build modflow6
run: devenv msvs/mf6.sln /Build

- name: Show build log
shell: bash
run: cat "D:\a\modflow6\modflow6\msvs\UpgradeLog.htm"

test_pymake:
name: Test pymake integration
runs-on: ${{ matrix.os }}
Expand Down
6 changes: 1 addition & 5 deletions scripts/install_windows.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
curl.exe --output %TEMP%\webimage.exe --url %2 --retry 5 --retry-delay 5
start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log
del %TEMP%\webimage.exe
if "%3"=="" (
webimage_extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=%4 -p=NEED_VS2019_INTEGRATION=%5 -p=NEED_VS2022_INTEGRATION=%6 --log-dir=. --install-dir %1
) else (
webimage_extracted\bootstrapper.exe -s --action install --components=default:%3 --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. --install-dir %1
)
webimage_extracted\bootstrapper.exe -s --action install --components=default:%3 --eula=accept -p=NEED_VS2017_INTEGRATION=%4 -p=NEED_VS2019_INTEGRATION=%5 -p=NEED_VS2022_INTEGRATION=%6 --log-dir=. --install-dir %1
rd /s/q "webimage_extracted"

0 comments on commit 776a4f3

Please sign in to comment.