search

cp3-llbb / Framework

Common framework for all cp3-llbb analyses
https://github.com/cp3-llbb/cp3-llbb.github.io/wiki/CP3-llbb(met):-Getting-Started
0 stars 13 forks source link

Workaround for 'git cms-merge-topic <hash>' #274

Closed pieterdavid closed 6 years ago

pieterdavid commented 6 years ago

I copied the few relevant lines from git-cms-merge-topic, and assumed we always take a commit. The tricky part is related to sparse-checkout (figuring out the merge base, and using that to update the sparse-checkout config, but the hard part is done by cms-sparse-checkout). I also took the freedom to reduce the number of git cms-checkdeps calls to one, that saves a bit of printout.

cp3-llbb-bot commented 6 years ago

Build triggered. sha1 is merged.

cp3-llbb-bot commented 6 years ago

Build started sha1 is merged.

cp3-llbb-bot commented 6 years ago

Build finished.

pieterdavid commented 6 years ago

That was quick... too bad jenkins isn't using zsh instead of bash :(

blinkseb commented 6 years ago

Try changing the shebang of the script, it may help :)

cp3-llbb-bot commented 6 years ago

Build triggered. sha1 is merged.

cp3-llbb-bot commented 6 years ago

Build started sha1 is merged.

cp3-llbb-bot commented 6 years ago

Build finished.

pieterdavid commented 6 years ago

Thanks for the suggestion, but it sources the bootstrap script (with . .../bootstrap_jenkins.sh), so that doesn't help :-(, I'll check the jenkins config

pieterdavid commented 6 years ago

@cp3-llbb-bot : please test

cp3-llbb-bot commented 6 years ago

Build triggered. sha1 is merged.

cp3-llbb-bot commented 6 years ago

Build started sha1 is merged.

cp3-llbb-bot commented 6 years ago

Build finished.

OlivierBondu commented 6 years ago

Let's wait for @pieterdavid to have his look at the cms-merge-topic history before merging ?

cp3-llbb-bot commented 6 years ago

Build triggered. sha1 is merged.

cp3-llbb-bot commented 6 years ago

Build started sha1 is merged.

cp3-llbb-bot commented 6 years ago

Build finished.

pieterdavid commented 6 years ago

The log looks fine now :-) . For reference: this broke with this change (12 December 2017) in git-cms-merge-topic, so release areas from before that should be fine. I pushed another commit to use git cms-init --upstream-only which should save quite some time and printout (because it doesn't need to get all the old tags), let's wait for the tests and then it should be fine to merge

pieterdavid commented 6 years ago

@cp3-llbb-bot please test

OlivierBondu commented 6 years ago

Thanks !