Skip to content

Commit 7591d19

Browse files
committed
1 parent ff16fd9 commit 7591d19

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ runs:
5757
- name: Configure environment
5858
shell: bash
5959
run: |
60-
echo "PKG_CONFIG_PATH=$GITHUB_WORKSPACE/petsc/arch-gcc-opt/lib/pkgconfig" >> $GITHUB_ENV
60+
echo "PETSC_DIR=$GITHUB_WORKSPACE/petsc" >> $GITHUB_ENV
61+
echo "PETSC_ARCH=arch-gcc-opt" >> $GITHUB_ENV
6162
echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/petsc/arch-gcc-opt/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
6263
echo "$GITHUB_WORKSPACE/petsc/arch-gcc-opt/bin" >> $GITHUB_PATH
6364
if [ "$RUNNER_OS" == "macOS" ]; then
@@ -87,7 +88,7 @@ runs:
8788
shell: bash
8889
working-directory: modflow6
8990
run: |
90-
pixi run setup -Dextended=true builddir
91+
pixi run setup-extended builddir
9192
pixi run build builddir
9293
pixi run test builddir
9394

pixi.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ fix-python-style = { cmd = "pixi run check-python-lint --fix; pixi run fix-pytho
7878
# meson build/test for mf6 and zbud6
7979
builddir = "echo _builddir"
8080
setup = { cmd = "meson setup --prefix=$(pwd) --libdir=bin --bindir=bin", env = { PKG_CONFIG_PATH = "$CONDA_PREFIX/lib/pkgconfig" } }
81+
setup-extended = { cmd = "meson setup --prefix=$(pwd) --libdir=bin --bindir=bin -Dextended=true", env = { PKG_CONFIG_PATH = "$PETSC_DIR/$PETSC_ARCH/lib/pkgconfig:$CONDA_PREFIX/lib/pkgconfig" } }
8182
build = "meson install -C"
8283
test = "meson test --verbose --no-rebuild -C"
8384

0 commit comments

Comments
 (0)