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

Lots of commits not in master but only in stable branch 2021.02.xx #502

Closed
tdipisa opened this issue Apr 1, 2022 · 3 comments
Closed

Lots of commits not in master but only in stable branch 2021.02.xx #502

tdipisa opened this issue Apr 1, 2022 · 3 comments
Assignees
Labels
Priority: High question Further information is requested

Comments

@tdipisa
Copy link
Collaborator

tdipisa commented Apr 1, 2022

@catmorales I've just noticed there are commits in stable branch 2021.02.xx provided by @jmbourdaret during March that are not present in master branch.

This way, when a new stable branch will be created in the future from the master one, these commits will be lost. The usual practice is to commit new updates in master branch first to backport them to a stable branch in a second time, according to the release needs and plans, after these have been tested and verified in master.

I've opened this issue just to point out this and to be sure commits provided by @jmbourdaret are effectively needed ONLY for the stable branch 2021.02.xx.

@tdipisa tdipisa added question Further information is requested Priority: High labels Apr 1, 2022
@landryb
Copy link
Member

landryb commented Apr 1, 2022

you're 100% right, even if those commits only target .github/workflows/mapstore.yml (and were related to georchestra/georchestra#3501) they should also be in master - as i think some of the bits also apply to master. @jmbourdaret ?

@catmorales
Copy link
Collaborator

catmorales commented Apr 1, 2022

Thank you @tdipisa to notice it.
Thank you @jmbourdaret and @pmauduit to have a look at this point .

@pmauduit
Copy link
Member

pmauduit commented Apr 1, 2022

Every commits from Jean-Marc are indeed targeting the github action workflow file. I guess it should be safe to take the version from the the 2021.02.x branch then create a PR on master out of it. It does not seem necessary to keep the history of these commits in the master branch.

pmauduit added a commit that referenced this issue Apr 1, 2022
Reading the workflow spec, it does not seem to contain anything that
could not match the master branch, so it should be pretty safe to merge.
@landryb landryb closed this as completed Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority: High question Further information is requested
Projects
None yet
Development

No branches or pull requests

5 participants