Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(ci): restructured ci to no longer test parallel and netcdf in isolation but only through the extended build #2088

Merged
merged 5 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions .github/actions/build-netcdf-mf6/action.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/actions/build-par-win/action.yml

This file was deleted.

47 changes: 5 additions & 42 deletions .github/actions/test-extended-win/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ description: Build and test extended MODFLOW 6 on Windows
runs:
using: "composite"
steps:

- name: Build MF6 parallel
uses: ./modflow6/.github/actions/build-extended-win

Expand All @@ -22,57 +21,21 @@ runs:
- name: Convert unix2dos
shell: cmd
run: |
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"
unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\test_modflow6_netcdf.bat" "%TEMP%\test_modflow6_netcdf.bat"

- name: Test programs (parallel)
if: github.ref_name != 'master'
shell: cmd
env:
REPOS_PATH: ${{ github.workspace }}
run: |
"%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6_parallel.bat"

- name: Test programs (parallel)
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_parallel.bat"

- name: Test programs (netcdf)
if: github.ref_name != 'master'
shell: cmd
env:
REPOS_PATH: ${{ github.workspace }}
run: |
"%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6_netcdf.bat"

- name: Test programs (netcdf)
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_netcdf.bat"
unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\test_modflow6_extended.bat" "%TEMP%\test_modflow6_extended.bat"

- name: Test programs (serial)
- 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_serial.bat"
"%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6_extended.bat"

- name: Test programs (serial)
- name: Test programs (extended)
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"
"%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "%TEMP%\test_modflow6_extended.bat"
19 changes: 17 additions & 2 deletions .github/actions/test-extended/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,24 @@ runs:
GITHUB_TOKEN: ${{ github.token }}
run: pixi run get-exes

- name: Test programs
- name: Test programs (macOS)
if: runner.os == 'macOS'
shell: bash
working-directory: modflow6
env:
REPOS_PATH: ${{ github.workspace }}
run: |
otool -L bin/libmf6.dylib
echo $DYLD_LIBRARY_PATH
pixi run autotest --parallel --netcdf -k "test_par or test_netcdf"

- name: Test programs (Linux)
if: runner.os != 'macOS'
shell: bash
working-directory: modflow6
env:
REPOS_PATH: ${{ github.workspace }}
run: pixi run autotest --parallel --netcdf -k "test_par or test_netcdf"
run: |
ldd bin/libmf6.so
echo $LD_LIBRARY_PATH
pixi run autotest --parallel --netcdf -k "test_par or test_netcdf"
45 changes: 0 additions & 45 deletions .github/actions/test-netcdf-win/action.yml

This file was deleted.

64 changes: 0 additions & 64 deletions .github/actions/test-netcdf/action.yml

This file was deleted.

60 changes: 0 additions & 60 deletions .github/actions/test-par-win/action.yml

This file was deleted.

80 changes: 0 additions & 80 deletions .github/actions/test-par/action.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .github/common/compile_modflow6.bat

This file was deleted.

Loading
Loading