Skip to content

Commit

Permalink
Merge pull request #191 from modflowpy/v1.2.10
Browse files Browse the repository at this point in the history
Release 1.2.10
  • Loading branch information
wpbonelli authored Jun 17, 2024
2 parents 3710564 + 9604c6f commit 516b61e
Show file tree
Hide file tree
Showing 52 changed files with 11,750 additions and 1,235 deletions.
29 changes: 0 additions & 29 deletions .flake8

This file was deleted.

192 changes: 192 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
name: pymake continuous integration

on:
schedule:
- cron: '0 7 * * *' # run at 7 AM UTC every day
push:
paths-ignore:
- 'README.md'
- 'docs/*.md'
pull_request:
branches:
- master
- develop
paths-ignore:
- 'README.md'
- 'docs/*.md'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:

pymake-os-compiler:
name: pymake compilers
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
# test latest gcc and python
- {os: ubuntu-latest, FC: gcc, FC_V: 13}
- {os: macos-latest, FC: gcc, FC_V: 13}
- {os: windows-latest, FC: gcc, FC_V: 13}
# test latest python and intel-classic
- {os: ubuntu-latest, FC: intel-classic, FC_V: 2021.7}
- {os: macos-13, FC: intel-classic, FC_V: 2021.7}
- {os: windows-2019, FC: intel-classic, FC_V: 2021.7}
# test latest python and previous gcc
- {os: ubuntu-latest, FC: gcc, FC_V: 12}
- {os: ubuntu-latest, FC: gcc, FC_V: 11}
defaults:
run:
shell: bash

steps:
- name: Checkout repo
uses: actions/checkout@v4

- uses: maxim-lobanov/setup-xcode@v1
if: ${{ (runner.os == 'macOS') && (matrix.FC == 'intel-classic') }}
with:
xcode-version: "14.3.1"

- name: Setup Graphviz on Linux
if: runner.os == 'Linux'
uses: ts-graphviz/setup-graphviz@v2

- name: Setup pixi
uses: prefix-dev/[email protected]
with:
pixi-version: v0.19.1
manifest-path: "pixi.toml"

- name: pixi post-install
working-directory: pymake
run: |
pixi run postinstall
- name: Setup ${{ matrix.FC }} ${{ matrix.FC_V }} on ${{ matrix.os }}
uses: fortran-lang/setup-fortran@main
with:
compiler: ${{ matrix.FC }}
version: ${{ matrix.FC_V }}

- name: Download examples for pytest runs
run: |
pixi run download-examples
- name: Install make
if: runner.os == 'Windows'
run: choco install make

- name: test on Linux
if: runner.os == 'Linux'
run: |
pixi run autotest
- name: test on MacOS
if: runner.os == 'macOS'
run: |
pixi run autotest-base
- name: test on Windows
if: runner.os == 'Windows'
shell: pwsh
run: |
pixi run autotest-base
- name: Upload failed test output
if: failure()
uses: actions/upload-artifact@v4
with:
name: failed-${{ matrix.os }}-${{ matrix.FC }}-${{ matrix.FC_V }}
path: ./autotest/.failed

- name: Print coverage report before upload
run: |
pixi run coverage-report
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
file: ./autotest/coverage.xml

pymake-schedule:
name: pymake scheduled
if: ${{ github.event_name == 'schedule' }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
# test latest gcc and python
- {os: ubuntu-latest, FC: gcc, FC_V: 13}
- {os: macos-latest, FC: gcc, FC_V: 13}
- {os: windows-latest, FC: gcc, FC_V: 13}
# test latest python and intel
- {os: ubuntu-latest, FC: intel-classic, FC_V: 2021.7}
- {os: macos-13, FC: intel-classic, FC_V: 2021.7}
- {os: windows-2019, FC: intel-classic, FC_V: 2021.7}
defaults:
run:
shell: bash

steps:
- name: Checkout repo
uses: actions/checkout@v4

- uses: maxim-lobanov/setup-xcode@v1
if: ${{ (runner.os == 'macOS') && (matrix.FC == 'intel-classic') }}
with:
xcode-version: "14.3.1"

- name: Setup Graphviz on Linux
if: runner.os == 'Linux'
uses: ts-graphviz/setup-graphviz@v2

- name: Setup pixi
uses: prefix-dev/[email protected]
with:
pixi-version: v0.19.1
manifest-path: "pixi.toml"

- name: pixi post-install
working-directory: pymake
run: |
pixi run postinstall
- name: Setup ${{ matrix.FC }} ${{ matrix.FC_V }} on ${{ matrix.os }}
uses: fortran-lang/setup-fortran@main
with:
compiler: ${{ matrix.FC }}
version: ${{ matrix.FC_V }}

- name: Install make
if: runner.os == 'Windows'
run: choco install make

- name: Run scheduled tests
run: |
pixi run autotest-schedule
- name: Upload failed test output
if: failure()
uses: actions/upload-artifact@v4
with:
name: failed-schedule-${{ matrix.os }}-${{ matrix.FC }}-${{ matrix.FC_V }}
path: ./autotest/.failed

- name: Print coverage report before upload
run: |
pixi run coverage-report
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
file: ./autotest/coverage.xml


80 changes: 0 additions & 80 deletions .github/workflows/main.yml

This file was deleted.

80 changes: 0 additions & 80 deletions .github/workflows/pymake-gcc.yml

This file was deleted.

Loading

0 comments on commit 516b61e

Please sign in to comment.