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.

Sign up for GitHub

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

Jump to bottom

ci: Actually bootstrap on i686 dist #48098

Merged
merged 1 commit into from
Feb 10, 2018
Merged

ci: Actually bootstrap on i686 dist #48098

merged 1 commit into from
Feb 10, 2018

Conversation

alexcrichton
Copy link
Member

Right now the --build option was accidentally omitted, so we're bootstraping
from x86_64 to i686. In addition to being slower (more compiles) that's not
actually bootstrapping!

@alexcrichton
ci: Actually bootstrap on i686 dist
9c05bab 
Right now the `--build` option was accidentally omitted, so we're bootstraping
from `x86_64` to `i686`. In addition to being slower (more compiles) that's not
actually bootstrapping!
@alexcrichton
Copy link
Member Author

r? @kennytm

@rust-highfive rust-highfive assigned kennytm and unassigned nikomatsakis Feb 9, 2018
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@Mark-Simulacrum
Copy link
Member

The OpenSSL change looks unrelated, perhaps separate PR or separate commit?

Otherwise though r=me.

@alexcrichton
Copy link
Member Author

Heh I would have thought so too! That's actually required though as the dist-i686 builder fails without the change. When we cargo install cargo-vendor it links in OpenSSL but this change means we're building a 32-bit cargo-vendor where the system only has a 64-bit OpenSSL.

@Mark-Simulacrum
Copy link
Member

Ah, makes sense. @bors r+

@bors
Copy link
Contributor

bors commented Feb 9, 2018

📌 Commit 9c05bab has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 9, 2018
@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 9, 2018
@alexcrichton
Copy link
Member Author

@bors: rollup

kennytm added a commit to kennytm/rust that referenced this pull request Feb 9, 2018
@kennytm
Rollup merge of rust-lang#48098 - alexcrichton:fix-i686-dist-bootstra…
258be62 
…p, r=Mark-Simulacrum

ci: Actually bootstrap on i686 dist

Right now the `--build` option was accidentally omitted, so we're bootstraping
from `x86_64` to `i686`. In addition to being slower (more compiles) that's not
actually bootstrapping!
@kennytm kennytm mentioned this pull request Feb 9, 2018
Closed
bors added a commit that referenced this pull request Feb 9, 2018
@bors
Auto merge of #48104 - kennytm:rollup, r=kennytm
394ccaf 
Rollup of 17 pull requests

- Successful merges: #47790, #47835, #47854, #48015, #48047, #48051, #48058, #48059, #48064, #48078, #48080, #48085, #48086, #48090, #48093, #48098, #48101
- Failed merges:
@alexcrichton alexcrichton mentioned this pull request Feb 10, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Feb 10, 2018
@kennytm
Rollup merge of rust-lang#48098 - alexcrichton:fix-i686-dist-bootstra…
22c5067 
…p, r=Mark-Simulacrum

ci: Actually bootstrap on i686 dist

Right now the `--build` option was accidentally omitted, so we're bootstraping
from `x86_64` to `i686`. In addition to being slower (more compiles) that's not
actually bootstrapping!
@kennytm kennytm mentioned this pull request Feb 10, 2018
Merged
bors added a commit that referenced this pull request Feb 10, 2018
@bors
Auto merge of #48113 - kennytm:rollup, r=kennytm
d5e3164 
Rollup of 16 pull requests

- Successful merges: #47790, #47835, #47854, #48015, #48047, #48051, #48058, #48059, #48064, #48078, #48080, #48086, #48098, #48101, #48107, #48100
- Failed merges:
bors added a commit that referenced this pull request Feb 10, 2018
@bors
Auto merge of #48113 - kennytm:rollup, r=kennytm
45fba43 
Rollup of 20 pull requests

- Successful merges: #47790, #47835, #47854, #48015, #48047, #48051, #48058, #48059, #48064, #48078, #48080, #48086, #48098, #48101, #48107, #48100, #48085, #48120, #48124, #47547
- Failed merges:
@bors bors merged commit 9c05bab into rust-lang:master Feb 10, 2018
@alexcrichton alexcrichton deleted the fix-i686-dist-bootstrap branch February 26, 2018 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kennytm kennytm

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alexcrichton @rust-highfive @Mark-Simulacrum @bors @kennytm @nikomatsakis