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

Update ESMValTool instructions on Gadi #598

Merged
merged 2 commits into from
Nov 8, 2023

Conversation

rbeucher
Copy link
Member

@rbeucher rbeucher commented Nov 2, 2023

Update the instructions on how to load/use ESMValTool on Gadi.

@rbeucher rbeucher changed the title Update ESMValTool instruction on Gadi Update ESMValTool instructions on Gadi Nov 2, 2023
@atteggiani atteggiani changed the base branch from main to development November 8, 2023 00:33
@flicj191 flicj191 merged commit e4e3038 into development Nov 8, 2023
2 checks passed
@atteggiani atteggiani deleted the update_esmvaltool_instructions branch November 8, 2023 00:45
@rbeucher
Copy link
Member Author

@atteggiani Things like that should go to main directly. We want the users to have access to the latest information...

@atteggiani
Copy link
Contributor

@atteggiani Things like that should go to main directly. We want the users to have access to the latest information...

@rbeucher I disagree.
I agree that users should have access to the latest information, but if we have a general workflow that creates PRs with development and then periodically merges it to main I would still follow it.
In this case, if we think it's something that should be merged more quickly, I would still create a PR to development, and then once it's merged I would merge development into main.

@rbeucher
Copy link
Member Author

rbeucher commented Nov 14, 2023

Dev should be for new functionalities or new content, not content updates...
We are releasing ESMValTool at the end of the week. I am gonna have to make some changes.
If you merge dev into main you take the risk of breaking things... We need a bit more flexibility here.

@atteggiani
Copy link
Contributor

atteggiani commented Nov 14, 2023

But much of our new development will only be content. I still think we should be following the standard workflow for that.

We should not be breaking anything by merging Development to Main.
That's because we should check every PR to Development (1st check) and then double check when we merge to main.
Of course there is always the possibility to overlook some things, but in general I think this is a good methodology/workflow to keep mistakes to a minimum.

Anyway, we can discuss this better tomorrow during the Hive docs meeting (1:30pm).
I can let you know in case you want to join only when we talk about this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants