ci(release): fix workflow to pass test markers/filters to extended build (#2528)

some reorganization in the release workflow to consistently pass test markers and filters to the test step (if testing is activated) for both regular and extended build flavors

Author: wpbonelli

.github/actions/test-extended-win/action.yml

@@ -23,19 +23,12 @@ runs:
       run: |
         unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\test_modflow6_extended.bat" "%TEMP%\test_modflow6_extended.bat"
 
-    - name: Test programs (extended)
-      if: github.ref_name != 'master'
-      shell: cmd
-      env:
-        REPOS_PATH: ${{ github.workspace }}
-      run: |
-        "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6_extended.bat"
-
     - name: Test programs (extended)
       if: github.ref_name == 'master'
       shell: cmd
       env:
         REPOS_PATH: ${{ github.workspace }}
-        MARKERS: not developmode
+        MARKERS: ${{ env.MARKERS }}
+        FILTERS: ${{ env.FILTERS }}
       run: |
         "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6_extended.bat"

.github/common/test_modflow6_extended.bat

@@ -1,2 +1,2 @@
 cd "%GITHUB_WORKSPACE%\modflow6\autotest"
-pixi run autotest -m "%MARKERS%" --netcdf --parallel
+pixi run autotest -m "%MARKERS%" -k "%FILTERS%" --netcdf --parallel

.github/workflows/release.yml

@@ -112,6 +112,20 @@ jobs:
           path: modflow6
           ref: ${{ inputs.branch }}
 
+      - name: Checkout modflow6-testmodels
+        if: inputs.run_tests == true && runner.os != 'Windows'
+        uses: actions/checkout@v5
+        with:
+          repository: MODFLOW-ORG/modflow6-testmodels
+          path: modflow6-testmodels
+
+      - name: Checkout modflow6-examples
+        if: inputs.run_tests == true && runner.os != 'Windows'
+        uses: actions/checkout@v5
+        with:
+          repository: MODFLOW-ORG/modflow6-examples
+          path: modflow6-examples
+
       - name: Setup pixi
         uses: prefix-dev/[email protected]
         with:
@@ -160,7 +174,17 @@ jobs:
           fi
           eval "$cmd"
 
-      - name: Get OS tag
+      - name: Update flopy
+        if: inputs.run_tests == true && runner.os != 'Windows'
+        working-directory: modflow6
+        run: |
+          cmd="pixi run update-flopy"
+          if [[ "${{ inputs.developmode }}" == "false" ]]; then
+            cmd="$cmd --releasemode"
+          fi
+          eval "$cmd"
+
+      - name: Set OS tag
         id: ostag
         working-directory: modflow6
         run: |
@@ -170,6 +194,34 @@ jobs:
           fi
           echo "ostag=$ostag" >> $GITHUB_OUTPUT
 
+      - name: Get executables
+        if: inputs.run_tests == true && runner.os != 'Windows'
+        working-directory: modflow6
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: pixi run get-exes -s
+
+      - name: Set markers
+        if: inputs.run_tests == true
+        id: set_markers
+        run: |
+          markers="not large"
+          if [[ "${{ inputs.developmode }}" == "false" ]]; then
+            markers="$markers and not developmode"
+          fi
+          echo "markers=$markers" >> $GITHUB_OUTPUT
+
+      - name: Set filters
+        if: inputs.run_tests == true
+        id: set_filters
+        run: |
+          filters=""
+          if [[ "${{ matrix.os }}" == "macos-14" ]]; then
+            # comparison fails on macos-14 with optimization=1
+            filters="not test028_sfr_rewet"
+          fi
+          echo "filters=$filters" >> $GITHUB_OUTPUT
+
       # for statically linked gfortran ARM mac build
       - name: Hide dylibs (macOS)
         if: matrix.os == 'macos-14'
@@ -221,14 +273,11 @@ jobs:
         uses: ./modflow6/.github/actions/build-extended-win
 
       - name: Build and test binaries (Windows)
-        if: runner.os == 'Windows' && matrix.extended && inputs.run_tests && inputs.developmode
-        uses: ./modflow6/.github/actions/test-extended-win
-
-      - name: Build and test binaries (Windows)
-        if: runner.os == 'Windows' && matrix.extended && inputs.run_tests && !inputs.developmode
+        if: runner.os == 'Windows' && matrix.extended && inputs.run_tests
         uses: ./modflow6/.github/actions/test-extended-win
         env:
-          MARKERS: not developmode
+          MARKERS: ${{ steps.set_markers.outputs.markers }}
+          FILTERS: ${{ steps.set_filters.outputs.filters }}
 
       - name: Copy deps to bin dir
         if: runner.os == 'Windows' && matrix.extended
@@ -273,59 +322,7 @@ jobs:
         with:
           name: bin-${{ steps.ostag.outputs.ostag }}
           path: modflow6/bin
-
-      - name: Checkout modflow6-testmodels
-        if: inputs.run_tests == true && runner.os != 'Windows'
-        uses: actions/checkout@v5
-        with:
-          repository: MODFLOW-ORG/modflow6-testmodels
-          path: modflow6-testmodels
-
-      - name: Checkout modflow6-examples
-        if: inputs.run_tests == true && runner.os != 'Windows'
-        uses: actions/checkout@v5
-        with:
-          repository: MODFLOW-ORG/modflow6-examples
-          path: modflow6-examples
-
-      - name: Update flopy
-        if: inputs.run_tests == true && runner.os != 'Windows'
-        working-directory: modflow6
-        run: |
-          cmd="pixi run update-flopy"
-          if [[ "${{ inputs.developmode }}" == "false" ]]; then
-            cmd="$cmd --releasemode"
-          fi
-          eval "$cmd"
-
-      - name: Get executables
-        if: inputs.run_tests == true && runner.os != 'Windows'
-        working-directory: modflow6
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: pixi run get-exes -s
-
-      - name: Set markers
-        if: inputs.run_tests == true && runner.os != 'Windows'
-        id: set_markers
-        run: |
-          markers="not large"
-          if [[ "${{ inputs.developmode }}" == "false" ]]; then
-            markers="$markers and not developmode"
-          fi
-          echo "markers=$markers" >> $GITHUB_OUTPUT
-
-      - name: Set filters
-        if: inputs.run_tests == true && runner.os != 'Windows'
-        id: set_filters
-        run: |
-          filters=""
-          if [[ "${{ matrix.os }}" == "macos-14" ]]; then
-            # comparison fails on macos-14 with optimization=1
-            filters="not test028_sfr_rewet"
-          fi
-          echo "filters=$filters" >> $GITHUB_OUTPUT
-
+      
       - name: Test MF6
         if: inputs.run_tests == true && runner.os != 'Windows'
         working-directory: modflow6