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

build fixes in master that should get cherry-picked into release/7.8.1 #859

Closed
nrnhines opened this issue Dec 7, 2020 · 7 comments
Closed

Comments

@nrnhines
Copy link
Member

nrnhines commented Dec 7, 2020

Need to cherry-pick from the following items from git rebase -i release/7.8.1.
(the commits that will NOT be included for release will be ticked off)

@pramodk
Copy link
Member

pramodk commented Dec 7, 2020

@nrnhines : this looks like a bit long list. I wonder if we should reduce it to minimal as we are planning 8.0 alpha soon anyway.
e.g. going from 7.8.1 to 7.8.2, I would't include Dblunits (#853) which changes the result.

cc: @alexsavulescu

@alexsavulescu
Copy link
Member

A fair amount of commits are non-relevant release wise. #853 would normally imply 7.9 or even 8.0, so I agree with @pramodk it should be left out. If 8.0.alpha is very soon, we can target a few specific changesets for 7.8.2.

@nrnhines
Copy link
Member Author

nrnhines commented Dec 7, 2020

That is the entire list to select from. The selection would hopefully be a dozen or so. The difficulty i had today was that many of the items could not be cherry picked without manual attention. I think I'll try to (automatically) reduce the list to just those which cherry-pick successfully and then figure out the desired selection from that.

@nrnhines
Copy link
Member Author

nrnhines commented Dec 8, 2020

The 22 selected for cherry picking are

e341499
3ea6c3d
bf3a292
ddf47c7
71eda9d
a77db57
f698710
da76365
1759767
1a7d97c
f560830
e1194ee
acdd898
ef5bc82
a640445
f6105de
8f2aaaa
e68a690
68ae199
8302621
d87f34b
41ec0b2

@nrnhines
Copy link
Member Author

nrnhines commented Dec 8, 2020

Manual operations required by the cherry pick are

e341499 skip
3ea6c3d skip
bf3a292 
ddf47c7
71eda9d
a77db57
f698710
da76365 skip
1759767
1a7d97c
f560830 resolve
e1194ee
acdd898
ef5bc82 resolve
a640445 resolve
f6105de resolve
8f2aaaa
e68a690
68ae199 skip
8302621 skip
d87f34b skip
41ec0b2 resolve

@nrnhines
Copy link
Member Author

nrnhines commented Dec 8, 2020

@adamjhn Just list the extra changes to cherry-pick for rxd here. Thanks. ... I'm seeing

677b1da
a42fae5
1101017
5feec90
22a6f40

the manual operations required were

677b1da resolve
a42fae5
1101017 resolve
5feec90
22a6f40

@nrnhines
Copy link
Member Author

nrnhines commented Dec 9, 2020

to avoid compile errors, rxd cherry-pick requires 7c567ba so reset and move branch to cherry-master-7.8.1-2 . Compilation was
successful with

7c567ba
677b1da
a42fae5
1101017 resolve
5feec90
22a6f40

also, for successful compilation, modlunit/units.c had to be reverted back to b6e02bc

olupton added a commit that referenced this issue Dec 7, 2022
* Use named structs instead of functions, pass instances to solvers.
* Goes with BlueBrain/CoreNeuron#809.
* Add fmt_line, fmt_start_block and restart_block methods to CodePrinter.
* gitlab-ci: support CVF_BRANCH variable.
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

No branches or pull requests

3 participants