github PRs not rebased on master sorted by github user

Post here if you have re-based and finalised code to integrate into master, which was discussed, agreed to and tested in other forums. You can also submit your PR directly on github.
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:

github PRs not rebased on master sorted by github user

Post by bernd »

these PR need rebase to make the CI run ... Take into account these are the github user names. They might not the same as the ones used here at the forum.

Only rebased PRs will be recognized by the CI https://gitlab.com/berndhahnebach/FreeC ... e=branches

List will be updated, if PRs gets merged or rebased

github user ByronMontgomerie:
https://github.com/FreeCAD/FreeCAD/pull/4987

github user totaru:
https://github.com/FreeCAD/FreeCAD/pull/4943

github user manuel-buchner:
https://github.com/FreeCAD/FreeCAD/pull/4887

github user matthijskooijman:
https://github.com/FreeCAD/FreeCAD/pull/4859

github user CarlOlson:
https://github.com/FreeCAD/FreeCAD/pull/4740

github user pilhuhn:
https://github.com/FreeCAD/FreeCAD/pull/4620

github user davidosterberg:
https://github.com/FreeCAD/FreeCAD/pull/4556

github user aapo-aapo:
https://github.com/FreeCAD/FreeCAD/pull/4524

github user vosk:
https://github.com/FreeCAD/FreeCAD/pull/4302

github user eszlari:
https://github.com/FreeCAD/FreeCAD/pull/4110

github user vocx-fc:
https://github.com/FreeCAD/FreeCAD/pull/3842

github user Vanuan:
https://github.com/FreeCAD/FreeCAD/pull/3772

github user kryptokommunist:
https://github.com/FreeCAD/FreeCAD/pull/3569

github user hobbes1069:
https://github.com/FreeCAD/FreeCAD/pull/3525

github user realthunder:
https://github.com/FreeCAD/FreeCAD/pull/4535
https://github.com/FreeCAD/FreeCAD/pull/3646
https://github.com/FreeCAD/FreeCAD/pull/3625
https://github.com/FreeCAD/FreeCAD/pull/3535
https://github.com/FreeCAD/FreeCAD/pull/3255
https://github.com/FreeCAD/FreeCAD/pull/2759
https://github.com/FreeCAD/FreeCAD/pull/2758
https://github.com/FreeCAD/FreeCAD/pull/2723






.
carlopav
Veteran
Posts: 2062
Joined: Mon Dec 31, 2018 1:49 pm
Location: Venice, Italy

Re: github PRs not rebased on master sorted by github user

Post by carlopav »

Thx @bernd for the head-up. My PRs are just Draft draft PRs and are not meant to be merged as they are now. In my opinion no need to waste compiler resources with them at the moment. I'll rebase them as soon as I'll add more commits. If you think it's necessary to rebase them now let me know and i'll do it asap.
follow my experiments on BIM modelling for architecture design
User avatar
PrzemoF
Veteran
Posts: 3520
Joined: Fri Jul 25, 2014 4:52 pm
Contact:

Re: github PRs not rebased on master sorted by github user

Post by PrzemoF »

Just to be clear: they need to be manually rebased because they can't be auto-rebased?

Edit: let me know if auto-rebasing is good enough. The gh->gl script does that and I could refresh all pr branches in my gl repo.
User avatar
bernd
Veteran
Posts: 12849
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:

Re: github PRs not rebased on master sorted by github user

Post by bernd »

PrzemoF wrote: Sun Sep 26, 2021 2:57 pm Just to be clear: they need to be manually rebased because they can't be auto-rebased?

Edit: let me know if auto-rebasing is good enough. The gh->gl script does that and I could refresh all pr branches in my gl repo.
great offer. IMHO the devs themselv should do the rebase. Thus it is much simpler for the CI. We can do some smart automatically stuff with them. Still the script is useful to know which PR does rebase.

BTW: welcome back. There has happened a lot in the regard of CI. I will post all my scripts soon.
User avatar
bernd
Veteran
Posts: 12849
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:

Re: github PRs not rebased on master sorted by github user

Post by bernd »

carlopav wrote: Sun Sep 26, 2021 2:02 pm Thx @bernd for the head-up. My PRs are just Draft draft PRs and are not meant to be merged as they are now. In my opinion no need to waste compiler resources with them at the moment. I'll rebase them as soon as I'll add more commits. If you think it's necessary to rebase them now let me know and i'll do it asap.
I it in not to much work for you it would be cool if you could rebase them on latest master. Thus they would be recognized by the CI even if it is not needed at the moment. But I would like to be as much PRs as possible to be automatically recognized by the CI.
User avatar
PrzemoF
Veteran
Posts: 3520
Joined: Fri Jul 25, 2014 4:52 pm
Contact:

Re: github PRs not rebased on master sorted by github user

Post by PrzemoF »

Thanks! All the script does it "try to rebase" and quit on fail. I'll take what's on gh and push it to gl.
carlopav
Veteran
Posts: 2062
Joined: Mon Dec 31, 2018 1:49 pm
Location: Venice, Italy

Re: github PRs not rebased on master sorted by github user

Post by carlopav »

done!
follow my experiments on BIM modelling for architecture design
User avatar
PrzemoF
Veteran
Posts: 3520
Joined: Fri Jul 25, 2014 4:52 pm
Contact:

Re: github PRs not rebased on master sorted by github user

Post by PrzemoF »

OK, the PRs are being pulled, rebased on top of master and force pushed to gitlab. It'll take ~8-10 hours to build them based on the previous tests. I might make the script more user friendly it we plan to use it in the future. I'll post the report of what failed to rebase soon.
Edit:
50 rebased OK, 21 failed to rebase on top of the master branch:

Code: Select all

$ git branch | grep gh-pr | grep -v abort
  gh-pr-3256
  gh-pr-3625
  gh-pr-3716
  gh-pr-3842
  gh-pr-4110
  gh-pr-4118
  gh-pr-4133
  gh-pr-4277
  gh-pr-4460
  gh-pr-4503
  gh-pr-4524
  gh-pr-4535
  gh-pr-4626
  gh-pr-4685
  gh-pr-4740
  gh-pr-4752
  gh-pr-4787
  gh-pr-4803
  gh-pr-4858
  gh-pr-4859
  gh-pr-4860
  gh-pr-4884
  gh-pr-4887
  gh-pr-4940
  gh-pr-4943
  gh-pr-4959
  gh-pr-4965
  gh-pr-4973
  gh-pr-4975
  gh-pr-4985
  gh-pr-4989
  gh-pr-4991
  gh-pr-4992
  gh-pr-4998
  gh-pr-4999
  gh-pr-5008
  gh-pr-5009
  gh-pr-5023
  gh-pr-5028
  gh-pr-5034
  gh-pr-5037
  gh-pr-5042
  gh-pr-5045
  gh-pr-5049
  gh-pr-5050
  gh-pr-5051
  gh-pr-5059
  gh-pr-5061
  gh-pr-5062
  gh-pr-5063
fedora:/home/przemo/software/FreeCAD/FreeCAD
$ git branch | grep aborted
  gh-pr-2723-rebase-aborted
  gh-pr-2758-rebase-aborted
  gh-pr-2759-rebase-aborted
  gh-pr-2862-rebase-aborted
  gh-pr-3062-rebase-aborted
  gh-pr-3255-rebase-aborted
  gh-pr-3525-rebase-aborted
  gh-pr-3535-rebase-aborted
  gh-pr-3569-rebase-aborted
  gh-pr-3646-rebase-aborted
  gh-pr-3767-rebase-aborted
  gh-pr-3772-rebase-aborted
  gh-pr-3775-rebase-aborted
  gh-pr-4302-rebase-aborted
  gh-pr-4425-rebase-aborted
  gh-pr-4556-rebase-aborted
  gh-pr-4620-rebase-aborted
  gh-pr-4911-rebase-aborted
  gh-pr-4933-rebase-aborted
  gh-pr-4952-rebase-aborted
  gh-pr-4987-rebase-aborted
  fedora:/home/przemo/software/FreeCAD/FreeCAD
$ git branch | grep aborted | wc -l
21
fedora:/home/przemo/software/FreeCAD/FreeCAD
$ git branch | grep gh-pr | grep -v abort | wc -l
50
User avatar
bernd
Veteran
Posts: 12849
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland
Contact:

Re: github PRs not rebased on master sorted by github user

Post by bernd »

FYI: for the branches which are rebased and the CI has finished a comment will be made. It looks like this. https://github.com/FreeCAD/FreeCAD/pull ... -927380726
User avatar
PrzemoF
Veteran
Posts: 3520
Joined: Fri Jul 25, 2014 4:52 pm
Contact:

Re: github PRs not rebased on master sorted by github user

Post by PrzemoF »

If you want to register my laptop as a temporary builder for your repo please PM me the token. I have delay with getting parts for the permanent builder, so I guess we have to use what's at hand. The builds in my repo will be finished in about 30 minutes from now.
Post Reply