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: 12849
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:

Re: Back port commits to 0.19 branch

Post by bernd »

we could make compile the CI all branches down to 0.13 ... we would just need an appropriate docker image of old ubuntu ... live is just to short to do all the funny stuff which makes no sense at all ... :mrgreen:
User avatar
bernd
Veteran
Posts: 12849
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:

Re: Back port commits to 0.19 branch

Post by bernd »

openBrain wrote: Fri Oct 01, 2021 3:58 pm Maybe you need a complete refspec :

Code: Select all

git push origin FreeCAD-0-19:releases/FreeCAD-0-19
I have no idea why this is needed but it did the trick ...

Code: Select all

$
$ git status
Auf Branch FreeCAD-0-19
Ihr Branch ist 1 Commit vor 'origin/releases/FreeCAD-0-19'.
  (benutzen Sie "git push", um lokale Commits zu publizieren)

nichts zu committen, Arbeitsverzeichnis unverändert
$ 
$ git push origin FreeCAD-0-19:releases/FreeCAD-0-19
Username for 'https://github.com': berndhahnebach
Password for 'https://berndhahnebach@github.com': 
Objekte aufzählen: 7, Fertig.
Zähle Objekte: 100% (7/7), Fertig.
Delta-Kompression verwendet bis zu 4 Threads.
Komprimiere Objekte: 100% (4/4), Fertig.
Schreibe Objekte: 100% (4/4), 407 bytes | 407.00 KiB/s, Fertig.
Gesamt 4 (Delta 2), Wiederverwendet 0 (Delta 0)
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
To https://github.com/FreeCAD/FreeCAD
   1f024523e6..de7cba4669  FreeCAD-0-19 -> releases/FreeCAD-0-19
$ 
openBrain
Veteran
Posts: 9034
Joined: Fri Nov 09, 2018 5:38 pm
Contact:

Re: Back port commits to 0.19 branch

Post by openBrain »

bernd wrote: Fri Oct 01, 2021 4:18 pm I have no idea why this is needed but it did the trick ...
I have no idea too. This is really strange because from your above 'git branch -vv', the tracking seems to be correct... :?
Maybe a Git Guru could explain...
User avatar
bernd
Veteran
Posts: 12849
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: 12849
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:

Re: Back port commits to 0.19 branch

Post by bernd »

openBrain
Veteran
Posts: 9034
Joined: Fri Nov 09, 2018 5:38 pm
Contact:

Re: Back port commits to 0.19 branch

Post by openBrain »

bernd wrote: Fri Oct 01, 2021 5:51 pm someone an idea why it fails ... https://gitlab.com/berndhahnebach/FreeC ... 202840/raw
:? I gave a link just above... Something else needed?
User avatar
bernd
Veteran
Posts: 12849
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:

Re: Back port commits to 0.19 branch

Post by bernd »

does it mean I need to patch occt on the docker container? :shock:

BTW: Why does it not fail on FreeCAD 0.20 build?
user1234
Veteran
Posts: 3348
Joined: Mon Jul 11, 2016 5:08 pm

Re: Back port commits to 0.19 branch

Post by user1234 »

I am pretty sure, that FreeCAD 0.19 will not compile with OCCT7.5.2, but maybe with OCCT7.5.0. OCCT7.5.2 came 2 day out before the release of 0.19.2.

https://git.dev.opencascade.org/gitweb/ ... ags/V7_5_2
https://github.com/FreeCAD/FreeCAD/releases/tag/0.19.2

Greetings
user1234
openBrain
Veteran
Posts: 9034
Joined: Fri Nov 09, 2018 5:38 pm
Contact:

Re: Back port commits to 0.19 branch

Post by openBrain »

bernd wrote: Fri Oct 01, 2021 6:56 pm does it mean I need to patch occt on the docker container? :shock:

BTW: Why does it not fail on FreeCAD 0.20 build?
Nope, the workaround fix in FreeCAD is this line : https://github.com/FreeCAD/FreeCAD/blob ... mp.cpp#L31
I think 0.19 wasn't compiled against OCC 7.5.2 so it doesn't fail. You have to backport the workaround if you want to compile 0.19 with this version of OCC.

Edit : commit hash if you want to cherry pick : git commit 91b0409c48fd726e81f498b8a77ec51efd1683f2
Post Reply