search

Homebrew / brew

🍺 The missing package manager for macOS (or Linux)
https://brew.sh
BSD 2-Clause "Simplified" License
40.8k stars 9.58k forks source link

Jenkins is accumulating commits #515

Closed ilovezfs closed 8 years ago

ilovezfs commented 8 years ago

Since I manually reset each of the nodes to d5489bca35795b55093feba4dea45be91c369756, the following commits have accumulated, none of which are in origin/master. This of course is causing conflicts and failed CI whenever a PR is force pushed.

6006c8c2da03cfc29c2e4927535e44bdef893745 corectl 0.7.11
2f68357ac8f6f1ba8165a86f99296c4e093a4608 sqlite: fix "functions" extension unknown ext lib name changes
f09900a82134897ea35e9eeabf0e74b525d83303 sqlite: fix / add regexp extension support
26d2b4dd037da7b5808f397b2f6ce90bfe7bf86e scala 2.12.0-M5 (devel)
0a4cff8e5047ac6fcf79d6d5225d3826d032adb3 pdnsrec 4.0.0
8468d3206e5a0988af623f6ec3c2439c90cf9f98 Add development version
6fae8ff8b2494ca2b4f5a8274fd3ba7bbd4cdfa5 Fix configure checks to fix compilation with Clang
2fc1a4170bf5e70f13a6eb94fa7b333c3e017cec Remove comment as requested in issue #2664
c5a8bc5c060132bdb0e263c9ccfb4d5593fb5893 Try to fix build error on OS X Mavericks
5d1b614716fc0cea6333676a6f73dec00f33bb7a liquid-dsp 1.2.0 (new formula)
55b44af3f16b526204f47dff4d3ba745c7387ff9 mypy 0.4.3
e46c3fef06093ea06c717d004a7bb5ae5bebeae3 steem 0.9.2rc2
58ee0e5e30c476cf9a1b9b6ba42ba61e9ee7a871 *std_cmake_args moved to the end
b585dc00f61d5d1e579c9dba934e22102bf6f230 yosemite, :el_capitan, :sierra
de16b1c85895fdf3bc548d5d7ffc40542a669d17 steem 0.8.5b
13ef13cb267f46484970b550f00793387695005a Jenkins thinks that Mavericks is older than Yosemite, but it's not. https://en.wikipedia.org/wiki/OS_X
f27bb6a0c5376f69c363aaa62a079e7ff537208b Yosemite support has been added
d65e0c9d4ce8abacbba44e312f02661df99da7ad python => python3
88be5d8a6588d8470cb29708cb2599641c77ff7a Minor fixes
9601ed767fb461660cffa2d26a99c51c10fbd9e5 steem 0.8.5
98b9b40ee8ac4cdc34e7d73fb5b4497772c6421e steem 0.8.5
5792acfd56de1060551067a675089de49cb161f6 pandoc-crossref 0.2.2.1
9ca12074362912c1b7505428528d68af6a7afb89 assh 2.4.0
d5489bca35795b55093feba4dea45be91c369756 flow: update 0.29.0 bottle.
MikeMcQuaid commented 8 years ago

Fixed in https://github.com/Homebrew/brew/commit/326039763276b2a38b8fcccea0be4a31493a6bda

MikeMcQuaid commented 8 years ago

(we were relying on Jenkins to reset the current branch before).

It's still on My List to at some point fix it so Jenkins checkout is done into the proper tap directory rather than in a random directory and then brew pull.

ilovezfs commented 8 years ago

That fix looks good. I was wondering why it only did reset --hard not reset --hard origin/master but figured there was some important reason for not doing the latter.

(we were relying on Jenkins to reset the current branch before).

The new version changed the behavior?

MikeMcQuaid commented 8 years ago

The new version changed the behavior?

Possibly or a plugin didn't migrate the old behaviour from a while ago. Not too worried considering the mid-term plan is to migrate to Jenkinsfiles.