Skip to content

Commit

Permalink
Merge branch 'develop' into release/MAPL-v3
Browse files Browse the repository at this point in the history
  • Loading branch information
mathomp4 committed Oct 31, 2024
2 parents 2994063 + 7c6f101 commit 0fbd3c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
name: Build and Test MAPL GNU
runs-on: ubuntu-latest
container:
image: gmao/ubuntu20-geos-env-mkl:v7.27.0-openmpi_5.0.2-gcc_13.2.0
image: gmao/ubuntu20-geos-env-mkl:v7.27.0-openmpi_5.0.5-gcc_14.2.0
# Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
# It seems like we might not need secrets on GitHub Actions which is good for forked
# pull requests
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- ESMA_cmake v3.52.0
- Fixes for using MAPL as a library in spack builds of GEOSgcm
- Various backports from v4
- Update CI to use v7.27.0 Baselibs
- Updates to CI
- Use v7.27.0 Baselibs
- Use GCC 14 for GNU tests

### Fixed

Expand Down

0 comments on commit 0fbd3c8

Please sign in to comment.