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.

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

Use the built cargo for cargotest. #73267

Merged
merged 1 commit into from
Jun 13, 2020
Merged

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 12, 2020

cargotest was using the beta (bootstrap) cargo. This changes it so that it will use the locally built cargo. This is intended to provide a sort of smoke test to ensure Cargo is functional. This shouldn't have any real impact on the CI build time. The cargotest job also happens to run cargo's testsuite, so it should already be building cargo.

Note: This will fail until #73266 is merged.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 12, 2020
@Mark-Simulacrum
Copy link
Member

r=me with the fix for Cargo merged

@ehuss
Copy link
Contributor Author

ehuss commented Jun 12, 2020

@bors r=Mark-Simulacrum rollup

@bors
Copy link
Contributor

bors commented Jun 12, 2020

📌 Commit 57b54c4 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 12, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 12, 2020
…Simulacrum

Use the built cargo for cargotest.

cargotest was using the beta (bootstrap) cargo. This changes it so that it will use the locally built cargo. This is intended to provide a sort of smoke test to ensure Cargo is functional. This *shouldn't* have any real impact on the CI build time.  The cargotest job also happens to run cargo's testsuite, so it should already be building cargo.

Note: This will fail until rust-lang#73266 is merged.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 13, 2020
…Simulacrum

Use the built cargo for cargotest.

cargotest was using the beta (bootstrap) cargo. This changes it so that it will use the locally built cargo. This is intended to provide a sort of smoke test to ensure Cargo is functional. This *shouldn't* have any real impact on the CI build time.  The cargotest job also happens to run cargo's testsuite, so it should already be building cargo.

Note: This will fail until rust-lang#73266 is merged.
RalfJung added a commit to RalfJung/rust that referenced this pull request Jun 13, 2020
…Simulacrum

Use the built cargo for cargotest.

cargotest was using the beta (bootstrap) cargo. This changes it so that it will use the locally built cargo. This is intended to provide a sort of smoke test to ensure Cargo is functional. This *shouldn't* have any real impact on the CI build time.  The cargotest job also happens to run cargo's testsuite, so it should already be building cargo.

Note: This will fail until rust-lang#73266 is merged.
RalfJung added a commit to RalfJung/rust that referenced this pull request Jun 13, 2020
…Simulacrum

Use the built cargo for cargotest.

cargotest was using the beta (bootstrap) cargo. This changes it so that it will use the locally built cargo. This is intended to provide a sort of smoke test to ensure Cargo is functional. This *shouldn't* have any real impact on the CI build time.  The cargotest job also happens to run cargo's testsuite, so it should already be building cargo.

Note: This will fail until rust-lang#73266 is merged.
RalfJung added a commit to RalfJung/rust that referenced this pull request Jun 13, 2020
…Simulacrum

Use the built cargo for cargotest.

cargotest was using the beta (bootstrap) cargo. This changes it so that it will use the locally built cargo. This is intended to provide a sort of smoke test to ensure Cargo is functional. This *shouldn't* have any real impact on the CI build time.  The cargotest job also happens to run cargo's testsuite, so it should already be building cargo.

Note: This will fail until rust-lang#73266 is merged.
RalfJung added a commit to RalfJung/rust that referenced this pull request Jun 13, 2020
…Simulacrum

Use the built cargo for cargotest.

cargotest was using the beta (bootstrap) cargo. This changes it so that it will use the locally built cargo. This is intended to provide a sort of smoke test to ensure Cargo is functional. This *shouldn't* have any real impact on the CI build time.  The cargotest job also happens to run cargo's testsuite, so it should already be building cargo.

Note: This will fail until rust-lang#73266 is merged.
RalfJung added a commit to RalfJung/rust that referenced this pull request Jun 13, 2020
…Simulacrum

Use the built cargo for cargotest.

cargotest was using the beta (bootstrap) cargo. This changes it so that it will use the locally built cargo. This is intended to provide a sort of smoke test to ensure Cargo is functional. This *shouldn't* have any real impact on the CI build time.  The cargotest job also happens to run cargo's testsuite, so it should already be building cargo.

Note: This will fail until rust-lang#73266 is merged.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 13, 2020
Rollup of 8 pull requests

Successful merges:

 - rust-lang#72932 (Clarify the behaviour of Pattern when used with methods like str::contains)
 - rust-lang#73066 (Querify whether a type has structural equality (Take 2))
 - rust-lang#73194 (Prefer the associated constants for pattern matching error)
 - rust-lang#73241 (Add/update comments about MinGW late_link_args)
 - rust-lang#73267 (Use the built cargo for cargotest.)
 - rust-lang#73290 (Fix links when pinging notification groups)
 - rust-lang#73302 (Adjusted some doctests in libcore to use `should_panic`.)
 - rust-lang#73308 (pretty/asm.rs should only be tested for x86_64 and not AArch64)

Failed merges:

r? @ghost
@bors bors merged commit 6a42f7d into rust-lang:master Jun 13, 2020
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants