Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Ninja build of MAPL #1673

Merged
merged 6 commits into from
Sep 15, 2022
Merged

Add Ninja build of MAPL #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8b9e99
Add Ninja build of MAPL
mathomp4 Sep 15, 2022
bfea1bd
Trivial commit to trigger CI
mathomp4 Sep 15, 2022
a101e94
Update ci bcs version
mathomp4 Sep 15, 2022
a02311e
Update circleci orb dev version
mathomp4 Sep 15, 2022
f6f7f8a
Move to final orb
mathomp4 Sep 15, 2022
a4b645b
Merge branch 'develop' into feature/mathomp4/add-ninja-build
mathomp4 Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

# Anchors to prevent forgetting to update a version
baselibs_version: &baselibs_version v7.5.0
bcs_version: &bcs_version v10.22.5
bcs_version: &bcs_version v10.23.0

orbs:
ci: geos-esm/circleci-tools@1
Expand All @@ -13,12 +13,13 @@ workflows:

# Builds MAPL in a "default" way - Intel
- ci/build:
name: build-and-test-MAPL-on-<< matrix.compiler >>
name: build-and-test-MAPL-on-<< matrix.compiler >>-using-<< matrix.cmake_generator >>
context:
- docker-hub-creds
matrix:
parameters:
compiler: [ifort]
cmake_generator: ['Unix Makefiles', 'Ninja']
baselibs_version: *baselibs_version
repo: MAPL
mepodevelop: false
Expand All @@ -38,12 +39,13 @@ workflows:
# Open MPI 5 will not have this limitation

- ci/build:
name: build-and-test-MAPL-on-<< matrix.compiler >>
name: build-and-test-MAPL-on-<< matrix.compiler >>-using-<< matrix.cmake_generator >>
context:
- docker-hub-creds
matrix:
parameters:
compiler: [gfortran]
cmake_generator: ['Unix Makefiles', 'Ninja']
baselibs_version: *baselibs_version
repo: MAPL
mepodevelop: false
Expand Down Expand Up @@ -143,6 +145,8 @@ workflows:
- parent_one_child_import_via_extdata
- parent_one_child_no_imports
- parent_two_siblings_connect_import_export
# We will only run the tutorials with GNU make. No need to double up
# as Ninja is a build test only
requires:
- build-and-test-MAPL-on-<< matrix.compiler >>
- build-and-test-MAPL-on-<< matrix.compiler >>-using-Unix Makefiles
baselibs_version: *baselibs_version
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Added Ninja build of MAPL to CI tests

### Changed

- Have `MAPL_AddChildFromDSO` call `MAPL_AddChildFromDSOMeta` (#1598)
Expand Down