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

Qual: Backport phan to 18.0 #30613

Closed
wants to merge 3 commits into from
Closed

Conversation

mdeweerd
Copy link
Contributor

@mdeweerd mdeweerd commented Aug 13, 2024

Qual: Backport phan to 18.0

This PR backports phan to 18.0.
It must be merge after the backport for 19.0, which is after a "backport" to 20.0 and an "empty" PR to develop which needs to be integrated first.

By following that order, the upward path (from 18.0 to 19.0 to 20.0 to develop) should be flawless, without any merge issues for the changes related to phan.
However, do not make a squash merge to make sure the history is understood by git.

@mdeweerd mdeweerd changed the base branch from develop to 18.0 August 13, 2024 00:08
@mdeweerd mdeweerd force-pushed the backport/phan/18 branch 3 times, most recently from 4bee1c3 to 9fc9b9c Compare August 13, 2024 02:53
@mdeweerd mdeweerd marked this pull request as ready for review August 13, 2024 12:06
@mdeweerd mdeweerd force-pushed the backport/phan/18 branch 2 times, most recently from 6b17e98 to 94ead13 Compare August 13, 2024 12:57
@mdeweerd mdeweerd marked this pull request as draft August 13, 2024 12:58
@mdeweerd mdeweerd force-pushed the backport/phan/18 branch 5 times, most recently from eb97846 to 9d62db5 Compare August 13, 2024 13:32
./.github/workflows/gh-travis.yml is included and inactive, but it
must exist for ci.yml.

To keep ci.yml the same accross versions, gh-travis.yml is included.
@mdeweerd mdeweerd marked this pull request as ready for review August 13, 2024 19:23
@mdeweerd
Copy link
Contributor Author

I think that the outcome of travis is some hazard (no code change in the tests or htdocs). There's been some trouble with travis I believe these last few days.

@eldy
Copy link
Member

eldy commented Aug 13, 2024

Old versions are versions already released and open for bug fix and only bug fix maintenance, as we must reduce as much as possible the printing of any change on maintenance versions. So code quality on already released version is not necessary so we can be more focused on develop branch.

@eldy eldy closed this Aug 13, 2024
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.

2 participants