Skip to content

Update fv3jedi repos from develop 2023/08/30#37

Merged
climbfuji merged 3 commits intodevelopfrom
feature/update_fv3jedi_from_develop_20230830
Aug 30, 2023
Merged

Update fv3jedi repos from develop 2023/08/30#37
climbfuji merged 3 commits intodevelopfrom
feature/update_fv3jedi_from_develop_20230830

Conversation

@climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Aug 30, 2023

Description

Temporarily change the branches for the three fv3jedi repos to test updates from develop. ,Even though the branch names will get reverted, we may end up merging this just to update a few comments in CMakeLists.txt

Testing in CI: https://github.com/JCSDA/ufs-bundle/actions/runs/6026366347/job/16349119705

Also tested successfully on my macOS for UFS_APP ATM (but didn't try any of the other apps).

There is an issue for updating soca feature/ufs_dom, which has fallen behind (outside of the scope of this PR): JCSDA-internal/soca#951

Issue(s) addressed

ufs-bundle broken after recent JEDI merges

Dependencies

List the other PRs that this PR is dependent on:

Impact

ufs-bundle will be un-broken

Checklist

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • I have run the unit tests before creating the PR

@climbfuji climbfuji force-pushed the feature/update_fv3jedi_from_develop_20230830 branch from 6543946 to 39b348e Compare August 30, 2023 13:50
@climbfuji climbfuji marked this pull request as ready for review August 30, 2023 15:57
@climbfuji climbfuji self-assigned this Aug 30, 2023
@climbfuji climbfuji added INFRA JEDI Infrastructure ALGO JEDI Algorithms labels Aug 30, 2023
@climbfuji
Copy link
Collaborator Author

CI tests passed after the latest push, ready to merge

Copy link
Contributor

@cmgas cmgas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good!

@climbfuji climbfuji merged commit 8c871e2 into develop Aug 30, 2023
@climbfuji climbfuji deleted the feature/update_fv3jedi_from_develop_20230830 branch August 30, 2023 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ALGO JEDI Algorithms INFRA JEDI Infrastructure

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants