From 46fa80acbbda8db194c89bea72002825e448e668 Mon Sep 17 00:00:00 2001
From: Wes Bonelli <wpb3hw@virginia.edu>
Date: Thu, 21 Sep 2023 13:26:47 -0400
Subject: [PATCH] debug install_windows.bat, add integration test

---
 .github/workflows/ci.yml          |  1 -
 .github/workflows/integration.yml | 35 +++++++++++++++++++++++++++++--
 scripts/install_windows.bat       |  6 +-----
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e1c40e..202b6cb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
 
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index ab2a302..59795ea 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -15,8 +15,8 @@ on:
   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
@@ -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 }}
diff --git a/scripts/install_windows.bat b/scripts/install_windows.bat
index a5d3de1..88791e0 100755
--- a/scripts/install_windows.bat
+++ b/scripts/install_windows.bat
@@ -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"
\ No newline at end of file