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

GitHub Actions for MAPLv3 development #155

Merged
merged 1 commit into from
Feb 25, 2022

Conversation

mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Feb 9, 2022

MAPL is working toward a version 3 that will have incompatibilities to MAPL 2. This branch is now on this repository called release/MAPL-v3 and will allow the SI Team to make changes to this repository while not affecting develop directly.

What this PR does is add a GitHub Action so that any push to develop (aka, any PR merged into develop) also automatically makes a PR from develop into release/MAPL-v3.

This way, our tracking branch can "keep up" with develop and once MAPL 3 is ready to go, all that is needed is to merge release/MAPL-v3 into develop and we are good.

Moreover, MAPL currently now does a build of GEOSadas with every PR. By having an "up-to-date" MAPL-3 ready branch here, we can also have that capability in our MAPL v3 development.

NOTE: This will add a bit of noise to GEOSadas where PRs like this:

GEOS-ESM/GEOSldas#524

will appear after merges to develop. The SI Team will take care of these when they happen as they are a reminder to us that we need to keep our release/MAPL-v3 branch up to date.

@mathomp4 mathomp4 added the 0 diff trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.) label Feb 9, 2022
@mathomp4 mathomp4 self-assigned this Feb 9, 2022
@mathomp4 mathomp4 requested review from a team as code owners February 9, 2022 13:47
Copy link
Collaborator

@tclune tclune left a comment

Choose a reason for hiding this comment

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

CI changes ok.

@rtodling
Copy link
Collaborator

Let me understand these .. if I pull them into develop and I am still using MAPL.2 ... will these break my use of MAPL 2?

@tclune
Copy link
Collaborator

tclune commented Feb 10, 2022

The changes in this PR will not break anything. Later changes that directly accommodate MAPL v3 will go on a special branch. Those you should not merge into develop, and we will not be issuing any PR's like that to temp you. This change is to separately (and automatically) test such changes on the release branch.

@mathomp4
Copy link
Member Author

Let me understand these .. if I pull them into develop and I am still using MAPL.2 ... will these break my use of MAPL 2?

Indeed, as @tclune says, all this is doing is setting things up so we can work on MAPL 3 changes without having to go near develop or main. We'll be on our own branch. But these updates allow us to essentially get "notifications" that develop has changed, so we know that we then need to merge these in to our branch.

The hope is that in XXX months, when MAPL 3 is ready, all we have to do is pull our branch into develop and boom you have a MAPL 3 ready GEOSadas!

Copy link
Collaborator

@rtodling rtodling left a comment

Choose a reason for hiding this comment

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

I will trust both of you (Matt & Tom) on this ...

@rtodling rtodling merged commit b0c690a into develop Feb 25, 2022
@mathomp4 mathomp4 deleted the feature/mathomp4/prepare-for-mapl-v3 branch July 12, 2023 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants