ci(msvs): test msvs build, fix tsp1.f90 path in mf6core.vfproj

MODFLOW-USGS · Sep 20, 2023 · 9632d97 · 9632d97
1 parent 66231fe
commit 9632d97
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
         run: python .github/common/fortran_format_check.py
 
   build:
-    name: Build
+    name: Build (meson)
     runs-on: ubuntu-22.04
     defaults:
       run:
@@ -76,6 +76,35 @@ jobs:
 
       - name: Meson test
         run: meson test --verbose --no-rebuild -C builddir
+
+  build_msvs:
+    name: Build (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: Setup Intel Fortran
+        uses: modflowpy/install-intelfortran-action@v1
+
+      - name: Build modflow6
+        run: devenv msvs/mf6.sln /Build
+
+      - name: Show build log
+        shel: bash
+        run: cat "D:\a\modflow6\modflow6\msvs\UpgradeLog.htm"
 
   smoke_test:
     name: Smoke test

diff --git a/msvs/mf6core.vfproj b/msvs/mf6core.vfproj
@@ -204,7 +204,7 @@
 		<File RelativePath="..\src\Model\ModelUtilities\Xt3dAlgorithm.f90"/>
 		<File RelativePath="..\src\Model\ModelUtilities\Xt3dInterface.f90"/></Filter>
 		<Filter Name="TransportModel">
-		<File RelativePath="..\src\Model\tsp1.f90"/></Filter>
+		<File RelativePath="..\src\Model\TransportModel\tsp1.f90"/></Filter>
 		<File RelativePath="..\src\Model\BaseModel.f90"/>
 		<File RelativePath="..\src\Model\ExplicitModel.f90"/>
 		<File RelativePath="..\src\Model\NumericalModel.f90"/>