Skip to content

Conversation

laanwj
Copy link
Member

@laanwj laanwj commented Jun 8, 2016

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

@theuni
Copy link
Member

theuni commented Jun 8, 2016

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

@paveljanik
Copy link
Contributor

ACK 7bbb818

@laanwj laanwj force-pushed the 2016_06_disable_bench_windows branch from 7bbb818 to 74c1347 Compare June 9, 2016 05:14
@laanwj
Copy link
Member Author

laanwj commented Jun 9, 2016

Rebased after #8167

@laanwj laanwj merged commit 74c1347 into bitcoin:master Jun 9, 2016
laanwj added a commit that referenced this pull request Jun 9, 2016
74c1347 gitian: Add --disable-bench to config flags for windows (Wladimir J. van der Laan)
zkbot pushed a commit to zcash/zcash that referenced this pull request Oct 17, 2016
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
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants