diff --git a/.github/actions/test-par-win/action.yml b/.github/actions/test-par-win/action.yml index 27e5e274223..2cfd04858be 100644 --- a/.github/actions/test-par-win/action.yml +++ b/.github/actions/test-par-win/action.yml @@ -22,7 +22,8 @@ runs: - name: Convert unix2dos shell: cmd run: | - unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\test_modflow6.bat" "%TEMP%\test_modflow6.bat" + unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\test_modflow6_parallel.bat" "%TEMP%\test_modflow6_parallel.bat" + unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\test_modflow6_serial.bat" "%TEMP%\test_modflow6_serial.bat" - name: Test programs if: github.ref_name != 'master' @@ -30,7 +31,7 @@ runs: env: REPOS_PATH: ${{ github.workspace }} run: | - "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6.bat" + "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6_parallel.bat" - name: Test programs if: github.ref_name == 'master' @@ -39,4 +40,21 @@ runs: REPOS_PATH: ${{ github.workspace }} MARKERS: not developmode run: | - "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6.bat" + "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6_parallel.bat" + + - name: Test programs (serial) + if: github.ref_name != 'master' + shell: cmd + env: + REPOS_PATH: ${{ github.workspace }} + run: | + "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6_serial.bat" + + - name: Test programs (serial) + if: github.ref_name == 'master' + shell: cmd + env: + REPOS_PATH: ${{ github.workspace }} + MARKERS: not developmode + run: | + "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6_serial.bat" diff --git a/.github/actions/test-par/action.yml b/.github/actions/test-par/action.yml index b14c8e78397..5b96a2835a6 100644 --- a/.github/actions/test-par/action.yml +++ b/.github/actions/test-par/action.yml @@ -80,3 +80,10 @@ runs: env: REPOS_PATH: ${{ github.workspace }} run: pixi run autotest --parallel -k "test_par" + + - name: Test programs (serial) + shell: bash + working-directory: modflow6 + env: + REPOS_PATH: ${{ github.workspace }} + run: pixi run autotest diff --git a/.github/common/test_modflow6.bat b/.github/common/test_modflow6_parallel.bat similarity index 100% rename from .github/common/test_modflow6.bat rename to .github/common/test_modflow6_parallel.bat diff --git a/.github/common/test_modflow6_serial.bat b/.github/common/test_modflow6_serial.bat new file mode 100644 index 00000000000..928045bf1ae --- /dev/null +++ b/.github/common/test_modflow6_serial.bat @@ -0,0 +1,4 @@ +cd "%GITHUB_WORKSPACE%\modflow6\autotest" +where libpetsc.dll +ldd ..\bin\mf6 +pixi run autotest -m "%MARKERS%" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce42d365270..1e3100dd83f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -486,6 +486,12 @@ jobs: with: path: modflow6 + - name: Checkout test models + uses: actions/checkout@v4 + with: + repository: MODFLOW-USGS/modflow6-testmodels + path: modflow6-testmodels + - name: Setup pixi uses: prefix-dev/setup-pixi@v0.8.1 with: