forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#93306 - ehuss:beta-backports, r=ehuss
[beta] Backports
* Update cargo
* rust-lang/cargo#10328 — remove --host flag
* rust-lang/cargo#10325 — Fix documenting with undocumented dependencies
* rust-lang#93128 — Add script to prevent point releases with same number as existing ones
* rust-lang#93014 — Revert "Do not hash leading zero bytes of i64 numbers in Sip128 hasher"
* rust-lang#93012 — Update pulldown-cmark version to fix markdown list issue- Loading branch information
Showing
7 changed files
with
55 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| #!/bin/bash | ||
| # On the stable channel, check whether we're trying to build artifacts with the | ||
| # same version number of a release that's already been published, and fail the | ||
| # build if that's the case. | ||
| # | ||
| # It's a mistake whenever that happens: the release process won't start if it | ||
| # detects a duplicate version number, and the artifacts would have to be | ||
| # rebuilt anyway. | ||
|
|
||
| set -euo pipefail | ||
| IFS=$'\n\t' | ||
|
|
||
| if [[ "$(cat src/ci/channel)" != "stable" ]]; then | ||
| echo "This script only works on the stable channel. Skipping the check." | ||
| exit 0 | ||
| fi | ||
|
|
||
| version="$(cat src/version)" | ||
| url="https://static.rust-lang.org/dist/channel-rust-${version}.toml" | ||
|
|
||
| if curl --silent --fail "${url}" >/dev/null; then | ||
| echo "The version number ${version} matches an existing release." | ||
| echo | ||
| echo "If you're trying to prepare a point release, remember to change the" | ||
| echo "version number in the src/version file." | ||
| exit 1 | ||
| else | ||
| echo "The version number ${version} does not match any released version!" | ||
| exit 0 | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule cargo
updated
3 files
| +15 −13 | src/cargo/core/compiler/unit_dependencies.rs | |
| +0 −5 | src/cargo/util/command_prelude.rs | |
| +46 −1 | tests/testsuite/doc.rs |