Skip to content

Commit

Permalink
ci fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
wpbonelli committed Jul 3, 2024
1 parent 69b654f commit da7c242
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions .github/workflows/ex-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ jobs:
- name: Install Python packages
working-directory: modflow6-examples/etc
run: |
python --version
python -m pip install --upgrade pip setuptools wheel
pip install -r requirements.pip.txt
pip install -r requirements.usgs.txt
Expand All @@ -88,7 +87,8 @@ jobs:
meson test --verbose --no-rebuild -C builddir
- name: Install MODFLOW 6
run: cp bin/* ~/.local/bin/modflow/
working-directory: modflow6
run: cp bin/mf6 ~/.local/bin/modflow/

- name: Create example models
working-directory: modflow6-examples/autotest
Expand All @@ -109,23 +109,20 @@ jobs:
path: modflow6-examples/${{ env.DISTNAME }}.zip

docs:
name: Test examples and build docs
name: Run examples, make docs
runs-on: ubuntu-latest
needs: lint
strategy:
fail-fast: false
matrix:
python: [3.9, "3.10", "3.11", "3.12"]
defaults:
run:
shell: bash
steps:
- name: Checkout MODFLOW6 examples
- name: Checkout MODFLOW 6 examples
uses: actions/checkout@v4
with:
path: modflow6-examples

- name: Checkout MODFLOW 6 repo
- name: Checkout MODFLOW 6
uses: actions/checkout@v4
with:
repository: MODFLOW-USGS/modflow6
Expand Down Expand Up @@ -165,7 +162,7 @@ jobs:
- name: Update FloPy classes
run: python -m flopy.mf6.utils.generate_classes --ref develop --no-backup

- name: Install MODFLOW executables release
- name: Install MODFLOW executables
uses: modflowpy/install-modflow-action@v1

- name: Build MODFLOW 6
Expand All @@ -176,8 +173,8 @@ jobs:
meson test --verbose --no-rebuild -C builddir
- name: Install MODFLOW 6
working-directory: modfow6
run: cp bin/* ~/.local/bin/modflow/
working-directory: modflow6
run: cp bin/mf6 ~/.local/bin/modflow/

- name: Run examples, make plots
working-directory: modflow6-examples/autotest
Expand Down

0 comments on commit da7c242

Please sign in to comment.