Skip to content

Commit

Permalink
ci: update workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
jdhughes-usgs committed Jun 16, 2024
1 parent b79af98 commit 74bcb07
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 207 deletions.
36 changes: 26 additions & 10 deletions .github/workflows/pymake-gcc.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pymake gcc build
name: pymake continuous integration

on:
schedule:
Expand All @@ -19,20 +19,24 @@ concurrency:
cancel-in-progress: true
jobs:

pymakeCI-os-gcc:
pymakeCI-os-compiler:
name: pymake CI gcc on different OSs
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
# test latest gcc and python
- {os: ubuntu-latest, gcc: 13}
- {os: windows-latest, gcc: 13}
- {os: macos-latest, gcc: 13}
- {os: ubuntu-latest, FC: gcc, FC_V: 13}
- {os: windows-latest, FC: gcc, FC_V: 13}
- {os: macos-latest, FC: gcc, FC_V: 13}
# test latest python and previous gcc
- {os: ubuntu-latest, gcc: 12}
- {os: ubuntu-latest, gcc: 11}
- {os: ubuntu-latest, FC: gcc, FC_V: 12}
- {os: ubuntu-latest, FC: gcc, FC_V: 11}
# test latest python and intel
- {os: ubuntu-latest, FC: intel-classic, FC_V: 2021.7}
- {os: windows-latest, FC: intel-classic, FC_V: 2021.7}
- {os: macos-13, FC: intel-classic, FC_V: 2021.7}
defaults:
run:
shell: bash
Expand All @@ -41,6 +45,11 @@ jobs:
- 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
Expand All @@ -56,11 +65,11 @@ jobs:
run: |
pixi run postinstall
- name: Setup GNU Fortran
- name: Setup ${{ env.FC }} ${{ env.FC_V }}
uses: fortran-lang/setup-fortran@main
with:
compiler: gcc
version: ${{ matrix.gcc }}
compiler: ${{ matrix.FC }}
version: ${{ matrix.FC_V }}

- name: Download examples for pytest runs
run: |
Expand All @@ -81,6 +90,13 @@ jobs:
run: |
pixi run autotest-Windows
- 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pymake continuous integration
name: pymake continuous integration intel

on:
schedule:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ target/

# files in the autotest directory
autotest/temp*/
autotest/.failed/
autotest/*.json
autotest/code.md
mod_temp/
Expand Down
34 changes: 0 additions & 34 deletions autotest/test_mflgr.py

This file was deleted.

91 changes: 0 additions & 91 deletions autotest/test_mfnwt.py

This file was deleted.

69 changes: 0 additions & 69 deletions autotest/test_triangle_makefile.py

This file was deleted.

3 changes: 1 addition & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ postinstall = "pip install --no-build-isolation --no-deps --disable-pip-version-

# format
check-lint = "ruff check ."
fix-lint = "ruff check . --fix"
check-format = "ruff format . --check"
fix-format = "ruff format ."
fix-style = "ruff check . --fix; ruff format ."

# build
test = "meson test --verbose --no-rebuild -C"
Expand Down

0 comments on commit 74bcb07

Please sign in to comment.