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

gitian: Add --disable-bench to config flags for windows #8175

Merged
merged 1 commit into from Jun 9, 2016

Conversation

Projects
None yet
3 participants
@laanwj
Member

laanwj commented Jun 8, 2016

Remove an unnecessary executable from the distribution. Forgot to do this in #7776.

@theuni

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Jun 8, 2016

Member

ACK, I was wondering if there was a reason this stuck around for win.

Member

theuni commented Jun 8, 2016

ACK, I was wondering if there was a reason this stuck around for win.

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Jun 8, 2016

Contributor

ACK 7bbb818

Contributor

paveljanik commented Jun 8, 2016

ACK 7bbb818

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 9, 2016

Member

Rebased after #8167

Member

laanwj commented Jun 9, 2016

Rebased after #8167

@laanwj laanwj merged commit 74c1347 into bitcoin:master Jun 9, 2016

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

laanwj added a commit that referenced this pull request Jun 9, 2016

Merge #8175: gitian: Add --disable-bench to config flags for windows
74c1347 gitian: Add --disable-bench to config flags for windows (Wladimir J. van der Laan)

@str4d str4d referenced this pull request Oct 15, 2016

Merged

Upstream gitian updates #1541

zkbot pushed a commit to zcash/zcash that referenced this pull request Oct 17, 2016

zkbot
Auto merge of #1541 - str4d:upstream-gitian-updates, r=bitcartel
Upstream gitian updates

This PR pulls in all gitian-related PRs that have been merged upstream since 0.11.2. The only ones I left out were documentation-only PRs, because we removed `doc/gitian-building.md` at some point. Here are the commits applied here, in the order shown in `git log` (ie. last to first):

- bitcoin/bitcoin#7283
  - fa42a67
  - fa58c76
- bitcoin/bitcoin#8175
  - 74c1347
- bitcoin/bitcoin#8167
  - 7e7eb27
  - ad38204
  - b676f38
- bitcoin/bitcoin#7776
  - f063863
- bitcoin/bitcoin#7424
  - a81c87f ~ we already partly applied
  - a8ce872
  - f3d3eaf ~ we already partly applied
  - 475813b
  - ~~cd27bf5~~ X we already applied
- bitcoin/bitcoin#7060
  - 3b468a0 ~ we removed doc/gitian-building.md
  - ~~99fda26~~ X we removed doc/gitian-building.md
- bitcoin/bitcoin#7251
  - fa09562
- bitcoin/bitcoin#6900
  - ~~2cecb24~~ X we removed doc/gitian-building.md
  - 957c0fd
  - 2e31d74
  - ~~0b416c6~~ X we removed QT
  - 9f251b7
- bitcoin/bitcoin#6854
  - 579b863 ~ we already partly applied

Part of #540
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment