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.

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

Sync develop and main #39

Merged
merged 8 commits into from
Aug 1, 2023
Merged

Sync develop and main #39

merged 8 commits into from
Aug 1, 2023

Conversation

sanAkel
Copy link
Collaborator

@sanAkel sanAkel commented Aug 1, 2023

This PR simply syncs the develop and main branches.

amolod and others added 8 commits June 5, 2023 10:56
Merge request "main-to-develop"
This PR updates the CI to point to Baselibs 7.13.0 which is the version used by GEOSgcm on `main`

It also adds small runs of GEOSgcm uncoupled and coupled-MOM6 to the CI
…13-ocean

Update CI to use Baselibs 7.13.0, add runs to CI
This PR updates the CircleCI config to default to using the Baselibs in
the CircleCI orb rather than explicitly specifying the versions. In most
cases, this is the "best" way as a change to the orb can fix this for
projects without the need for a PR.

Note that we keep commented the explicit anchors in case needed.
…aselibs-ocean

Update CircleCI to use Orb Default Baselibs and BCs
@sanAkel sanAkel requested a review from a team as a code owner August 1, 2023 16:20
@sanAkel sanAkel self-assigned this Aug 1, 2023
@github-actions
Copy link

github-actions bot commented Aug 1, 2023

Label error. Requires at least 1 of: 0 diff, 0 diff trivial, Non 0-diff, 0 diff structural, 0-diff trivial, Not 0-diff, 0-diff, automatic, 0-diff uncoupled. Found:

@sanAkel sanAkel requested a review from mathomp4 August 1, 2023 16:22
@sanAkel sanAkel added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Aug 1, 2023
@sanAkel sanAkel merged commit 2d3b443 into main Aug 1, 2023
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants