Skip to content

docs(contrib): Replace architecture with redirects #11876

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 22, 2023
Merged

docs(contrib): Replace architecture with redirects #11876

merged 1 commit into from
Mar 22, 2023

Conversation

epage
Copy link
Contributor

@epage epage commented Mar 22, 2023

I also went back to pages moved in #11869 and added redirects for those as well.

@epage
docs(contrib): Replace architecture with redirects
8baa207 
I also went back to pages moved in rust-lang#11869 and added redirects for those
as well.
@rustbot
Copy link
Collaborator

rustbot commented Mar 22, 2023

r? @ehuss

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

@rustbot rustbot added A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 22, 2023
@ehuss
Copy link
Contributor

ehuss commented Mar 22, 2023

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Mar 22, 2023

📌 Commit 8baa207 has been approved by ehuss

It is now in the queue for this repository.

@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 Mar 22, 2023
@bors
Copy link
Contributor

bors commented Mar 22, 2023

⌛ Testing commit 8baa207 with merge 6317170...

bors added a commit that referenced this pull request Mar 22, 2023
@bors
Auto merge of #11876 - epage:arch, r=ehuss
6317170 
docs(contrib): Replace architecture with redirects

I also went back to pages moved in #11869 and added redirects for those as well.
@bors
Copy link
Contributor

bors commented Mar 22, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 22, 2023
@ehuss
Copy link
Contributor

ehuss commented Mar 22, 2023

Unexpected test failure on macOS nightly:

---- rustc_info_cache::rustc_info_cache_with_wrappers stdout ----
running `/Users/runner/work/cargo/cargo/target/debug/cargo clean`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
running `/Users/runner/work/cargo/cargo/target/debug/cargo clean`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
thread 'rustc_info_cache::rustc_info_cache_with_wrappers' panicked at '
test failed running `/Users/runner/work/cargo/cargo/target/debug/cargo build`
error: process exited with code 0 (expected 101)
--- stdout

--- stderr
[2023-03-22T15:33:23Z DEBUG cargo::util::rustc] adding rustup info to rustc fingerprint
[2023-03-22T15:33:23Z DEBUG cargo::util::rustc] reusing existing rustc info cache
[2023-03-22T15:33:23Z DEBUG cargo::util::rustc] rustc info cache hit
[2023-03-22T15:33:23Z DEBUG cargo::util::rustc] rustc info cache hit
[2023-03-22T15:33:23Z DEBUG cargo::util::rustc] adding rustup info to rustc fingerprint
[2023-03-22T15:33:23Z DEBUG cargo::util::rustc] reusing existing rustc info cache
[2023-03-22T15:33:23Z DEBUG cargo::util::rustc] rustc info cache hit
    Finished dev [unoptimized + debuginfo] target(s) in 0.02s
', tests/testsuite/rustc_info_cache.rs:175:14

I've never seen that test fail before. For some reason, the build call here didn't catch that the mtime of the rustc wrapper changed. I'm a bit surprised, since I believe GitHub Actions is using APFS and that should have a relatively high resolution timestamps (roughly around 6µs on my system).

If this happens again in the future, it might be good to investigate more.

@bors retry

@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 Mar 22, 2023
@bors
Copy link
Contributor

bors commented Mar 22, 2023

⌛ Testing commit 8baa207 with merge b1dcb62...

@bors
Copy link
Contributor

bors commented Mar 22, 2023

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing b1dcb62 to master...

@bors bors merged commit b1dcb62 into rust-lang:master Mar 22, 2023
@epage epage deleted the arch branch March 22, 2023 18:39
weihanglo added a commit to weihanglo/rust that referenced this pull request Mar 27, 2023
@weihanglo
Update cargo
2436923 
9 commits in 15d090969743630bff549a1b068bcaa8174e5ee3..145219a9f089f8b57c09f40525374fbade1e34ae
2023-03-21 17:54:28 +0000 to 2023-03-27 01:56:36 +0000
- doc(contrib): missing quotation mark (rust-lang/cargo#11894)
- Update changelog for 1.68.2 (rust-lang/cargo#11893)
- Add the old github keys as revoked (rust-lang/cargo#11889)
- Update proptest (rust-lang/cargo#11886)
- Added new GitHub RSA Host Key (rust-lang/cargo#11883)
- doc: Fix registries.name.index for sparse (rust-lang/cargo#11880)
- docs(contrib): Replace architecture with redirects (rust-lang/cargo#11876)
- docs: fix typos in `cargo_compile/mod.rs` (rust-lang/cargo#11874)
- docs(contrub): Remove unused file (rust-lang/cargo#11873)
@weihanglo weihanglo mentioned this pull request Mar 27, 2023
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 27, 2023
@matthiaskrgr
Rollup merge of rust-lang#109656 - weihanglo:update-cargo, r=weihanglo
297e3a1 
Update cargo

9 commits in 15d090969743630bff549a1b068bcaa8174e5ee3..145219a9f089f8b57c09f40525374fbade1e34ae 2023-03-21 17:54:28 +0000 to 2023-03-27 01:56:36 +0000
- doc(contrib): missing quotation mark (rust-lang/cargo#11894)
- Update changelog for 1.68.2 (rust-lang/cargo#11893)
- Add the old github keys as revoked (rust-lang/cargo#11889)
- Update proptest (rust-lang/cargo#11886)
- Added new GitHub RSA Host Key (rust-lang/cargo#11883)
- doc: Fix registries.name.index for sparse (rust-lang/cargo#11880)
- docs(contrib): Replace architecture with redirects (rust-lang/cargo#11876)
- docs: fix typos in `cargo_compile/mod.rs` (rust-lang/cargo#11874)
- docs(contrub): Remove unused file (rust-lang/cargo#11873)

r? `@ghost`
@ehuss ehuss added this to the 1.70.0 milestone Apr 3, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

Labels
A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
4 participants
@epage @rustbot @ehuss @bors