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
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 »

uwestoehr wrote: Wed Jan 05, 2022 3:22 am 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?
if master or master 019 gets updates the CI starts automatically. For PRs I do this manually once a day for open PRs. PR 5335 is merged already. Thus see the CI run of 019 master ... https://gitlab.com/freecad/FreeCAD-CI/- ... eeCAD-0-19 CI runs fine (the green hook behind the commit) .
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: Wed Jan 05, 2022 3:36 pm if master or master 019 gets updates the CI starts automatically. For PRs I do this manually once a day for open PRs.
Thanks.
Maybe you can script the CI triggering that you don't have to do this manually? Ideally I would not merge if the CI did not run successfully but then we need the PR commit to be part of the automatically created build pipeline.
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 »

uwestoehr wrote: Wed Jan 05, 2022 3:43 pm
bernd wrote: Wed Jan 05, 2022 3:36 pm if master or master 019 gets updates the CI starts automatically. For PRs I do this manually once a day for open PRs.
Thanks.
Maybe you can script the CI triggering that you don't have to do this manually? Ideally I would not merge if the CI did not run successfully but then we need the PR commit to be part of the automatically created build pipeline.
There is a script which does all automatically except the git force push to get the branches to gitlab. This is on my TODO.

if you are interested ... https://github.com/FreeCAD/FreeCAD-CI/t ... ab/scripts
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: Wed Jan 05, 2022 4:11 pm There is a script which does all automatically except the git force push to get the branches to gitlab. This is on my TODO.
Thank, this feature is very appreciated because for example PRs like this:
https://github.com/FreeCAD/FreeCAD/pull/5310
are there for 6 days. The code looks OK but I wanted to wait for the CI to run the tests. Unfortunately the CI never started in this.
(I merged this PR now, it was just an example of the missing CI runs for PRs.)
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 »

Hmm, that's weird. Because in https://github.com/FreeCAD/FreeCAD/pull/5310
I see this:
firefox_EbopV4HTqC.png
firefox_EbopV4HTqC.png (33.85 KiB) Viewed 5037 times

Thus I waited to get a result. The CI already run:
https://gitlab.com/freecad/FreeCAD-CI/- ... /439824098
but this result is not transferred to GitHub.

This happens for most of the pending PRs:
https://github.com/FreeCAD/FreeCAD/pulls
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 »

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 »

only not merged PRs will be run by the CI. If a PR does not run, check if the branch exists on the CI here ... https://gitlab.com/freecad/FreeCAD-CI/-/branches/all If the branch does not exist, it means I have not pushed it yet. Thus no pipeline. If the branch exists and there is no pipeline it would mean some problems in the scripts.
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 »

Anyway, the CI again started to not compile 0.19 branch ...

https://gitlab.com/freecad/FreeCAD-CI/- ... eeCAD-0-19

https://gitlab.com/freecad/FreeCAD-CI/-/jobs/1948537615

Code: Select all

[ 58%] Generating 3Dconnexion/moc_GuiAbstractNativeEvent.cpp
[ 58%] Generating moc_Control.cpp
[ 58%] Generating moc_ManualAlignment.cpp
Scanning dependencies of target Sketcher
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/SketchObjectSF.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/SketchGeometryExtension.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/ExternalGeometryExtension.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/SolverGeometryExtension.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/SketchObject.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/SketchAnalysis.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/planegcs/GCS.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/planegcs/Geo.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/planegcs/Constraints.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/planegcs/SubSystem.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/planegcs/qp_eq.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/AppSketcher.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/AppSketcherPy.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/PreCompiled.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/SketchObjectSFPyImp.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/SketchObjectPyImp.cpp.o
../../../../../src/Mod/PartDesign/App/FeatureHole.cpp:580:39: error: 'const App::PropertyQuantityConstraint::Constraints PartDesign::Hole::floatAngle' is not a static data member of 'class PartDesign::Hole'
  580 | const App::PropertyAngle::Constraints Hole::floatAngle = { Base::toDegrees<double>(Precision::Angular()), 360.0, 1.0 };
      |                                       ^~~~
../../../../../src/Mod/PartDesign/App/FeatureHole.cpp: In constructor 'PartDesign::Hole::Hole()':
../../../../../src/Mod/PartDesign/App/FeatureHole.cpp:627:45: error: 'floatAngle' was not declared in this scope
  627 |     HoleCutCountersinkAngle.setConstraints(&floatAngle);
      |                                             ^~~~~~~~~~
make[2]: *** [src/Mod/PartDesign/App/CMakeFiles/PartDesign.dir/build.make:354: src/Mod/PartDesign/App/CMakeFiles/PartDesign.dir/FeatureHole.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:3222: src/Mod/PartDesign/App/CMakeFiles/PartDesign.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/SketchGeometryExtensionPyImp.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/ExternalGeometryExtensionPyImp.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/GeometryFacadePyImp.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/ExternalGeometryFacadePyImp.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/ConstraintPyImp.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/SketchPyImp.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/PropertyConstraintList.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/Constraint.cpp.o
[ 58%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/Sketch.cpp.o
[ 59%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/GeometryFacade.cpp.o
[ 59%] Building CXX object src/Mod/Sketcher/App/CMakeFiles/Sketcher.dir/ExternalGeometryFacade.cpp.o
[ 59%] Linking CXX shared library ../../../../Mod/Sketcher/Sketcher.so
[ 59%] Built target Sketcher
Scanning dependencies of target FreeCADGui
[ 59%] Building CXX object src/Gui/CMakeFiles/FreeCADGui.dir/3Dconnexion/GuiAbstractNativeEvent.cpp.o
[ 59%] Building CXX object src/Gui/CMakeFiles/FreeCADGui.dir/3Dconnexion/GuiNativeEventLinux.cpp.o

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: Fri Jan 07, 2022 5:49 am Anyway, the CI again started to not compile 0.19 branch ...

Thanks. I use the CI exactly for this. A recompilation for every backport would cat me about 45 min, so I let the CI do the work.

However the PRs are again not automatically compiled. For example I made this PR
https://github.com/FreeCAD/FreeCAD/pull/5355
to see if it compiles but the CI is not started, the pipeline has no scheduled tasks:
https://gitlab.com/freecad/FreeCAD-CI/-/pipelines
I thought you start this now automatically.
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: Sat Jan 08, 2022 2:01 am However the PRs are again not automatically compiled.
Here is an example where I suffer from this:
- this complex PR compiles fine with MSVC but fails with the CI: https://github.com/FreeCAD/FreeCAD/pull/5357
- I made a further commit to address the CI compiler failure, I also rebased the PR afterwards, but it does not appear in the CI Jobs list.

Fixing this compilation error might take a few attempts and I don't want to wait a day for every try.
Post Reply