Back port commits to 0.19 branch

Here's the place for discussion related to coding in FreeCAD, C++ or Python. Design, interfaces and structures.
Forum rules
Be nice to others! Respect the FreeCAD code of conduct!
User avatar
uwestoehr
Veteran
Posts: 4961
Joined: Sun Jan 27, 2019 3:21 am
Location: Germany
Contact:

Re: Back port commits to 0.19 branch

Post by uwestoehr »

openBrain wrote: Sun Dec 19, 2021 7:58 pm Well, OK. It's a bit hard to know what to do actually. PR message says to document on the wiki, and up to now I was advised to do so. Are their some (new) rules? Maybe bug fixes come here and new features in the wiki?
I take care of the backport releases. There was no rule set yet. First with FC 0.19.3 I implemented the following system:
- the first post in this thread lists all commits and PRs that have been backported or should be. Every developer change change the list to keep it up to date.
- to declare a PR or commit to be backported, please report it in this thread as new post. Then the developers have a look if this can be backported or not.
- only if something cannot be backported and if it is an important bugfix (crash etc.) we note it in the release notes
- the goal is to backport all bugfixes if possible.
- new features or improvements of features won't be backported

It works so far in my opinion. If you have proposals to improve it, every idea is welcome.
openBrain
Veteran
Posts: 9041
Joined: Fri Nov 09, 2018 5:38 pm
Contact:

Re: Back port commits to 0.19 branch

Post by openBrain »

uwestoehr wrote: Sun Dec 19, 2021 8:42 pm It works so far in my opinion. If you have proposals to improve it, every idea is welcome.
I'm fine with that. Basically matches the simple rule "bug fixes come here, new features directly in the wiki". ;)
Just a question : do we have release notes for minor releases?
User avatar
uwestoehr
Veteran
Posts: 4961
Joined: Sun Jan 27, 2019 3:21 am
Location: Germany
Contact:

Re: Back port commits to 0.19 branch

Post by uwestoehr »

openBrain wrote: Sun Dec 19, 2021 8:47 pm Just a question : do we have release notes for minor releases?
Sure:
https://github.com/FreeCAD/FreeCAD/releases/tag/0.19.3
openBrain
Veteran
Posts: 9041
Joined: Fri Nov 09, 2018 5:38 pm
Contact:

Re: Back port commits to 0.19 branch

Post by openBrain »

Thx. ;)
User avatar
Roy_043
Veteran
Posts: 8552
Joined: Thu Dec 27, 2018 12:28 pm

Re: Back port commits to 0.19 branch

Post by Roy_043 »

User avatar
bernd
Veteran
Posts: 12851
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:

Re: Back port commits to 0.19 branch

Post by bernd »

compiles not on the CI ... see https://gitlab.com/freecad/FreeCAD-CI/- ... eeCAD-0-19 and the failling build of the last commit https://gitlab.com/freecad/FreeCAD-CI/-/jobs/1937856766

here https://github.com/FreeCAD/FreeCAD/blob ... nder.h#L31 a file src/Mod/PartDesign/PartDesignGlobal.h is included. The file does exist in FreeCAD HEAD but not in relesases 0.19.

The problem was Introduced with this commit https://github.com/FreeCAD/FreeCAD/comm ... 1a0c77cR31
User avatar
uwestoehr
Veteran
Posts: 4961
Joined: Sun Jan 27, 2019 3:21 am
Location: Germany
Contact:

Re: Back port commits to 0.19 branch

Post by uwestoehr »

bernd wrote: Tue Jan 04, 2022 9:25 am here https://github.com/FreeCAD/FreeCAD/blob ... nder.h#L31 a file src/Mod/PartDesign/PartDesignGlobal.h is included. The file does exist in FreeCAD HEAD but not in relesases 0.19.
Thanks! I will then also backport the missing file and this time try if it compiles. I only backport bugfixes and this one is clearly one. However, to check if the backport compiles, cost me about 40 minutes. If I could in future rely on the CI would be helpful.
(Up to now I was busy with FC 0.19.3 and therefore only compiled the 0-19 branch up to the release tag.)
User avatar
uwestoehr
Veteran
Posts: 4961
Joined: Sun Jan 27, 2019 3:21 am
Location: Germany
Contact:

Re: Back port commits to 0.19 branch

Post by uwestoehr »

uwestoehr wrote: Tue Jan 04, 2022 11:33 am Thanks! I will then also backport the missing file
OK, I tried this and it appears this is not backportable. The code changes are too massive and not worth the effort. Therefore I reverted now the problematic backport.
Now the 0_19 branch passes the CI again:
https://gitlab.com/freecad/FreeCAD-CI/- ... /441576982

I noticed a CI compiler warning. I made a PR: https://github.com/FreeCAD/FreeCAD/pull/5335
but the CI has nothing in the pipeline to compile PRs at the moment. Could you please have a look?
User avatar
Roy_043
Veteran
Posts: 8552
Joined: Thu Dec 27, 2018 12:28 pm

Re: Back port commits to 0.19 branch

Post by Roy_043 »

Thanks for the new 0.19.3 version. The links in the Wiki have been updated. But https://www.freecadweb.org/downloads.php still links to the previous executable.
User avatar
uwestoehr
Veteran
Posts: 4961
Joined: Sun Jan 27, 2019 3:21 am
Location: Germany
Contact:

Re: Back port commits to 0.19 branch

Post by uwestoehr »

Roy_043 wrote: Wed Jan 05, 2022 9:36 am Thanks for the new 0.19.3 version. The links in the Wiki have been updated. But https://www.freecadweb.org/downloads.php still links to the previous executable.
I know. I already updated the Website files in GitHub but Yorik is the only one who can sync the website with this. He is in vacation.
Post Reply