Auto merge of #107767 - matthiaskrgr:rollup-9m1qfso, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #100599 (Add compiler error E0523 long description and test) - #107471 (rustdoc: do not include empty default-settings tag in HTML) - #107555 (Modify existing bounds if they exist) - #107662 (Turn projections into copies in CopyProp.) - #107695 (Add test for Future inflating arg size to 3x ) - #107700 (Run the tools builder on all PRs) - #107706 (Mark 'atomic_mut_ptr' methods const) - #107709 (Fix problem noticed in PR106859 with char -> u8 suggestion) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
bd39bbb4bb
36 changed files with 492 additions and 109 deletions
|
|
@ -307,8 +307,6 @@ jobs:
|
|||
- name: x86_64-gnu-tools
|
||||
<<: *job-linux-xl
|
||||
tidy: false
|
||||
env:
|
||||
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
|
||||
|
||||
auto:
|
||||
permissions:
|
||||
|
|
|
|||
|
|
@ -1,46 +1,11 @@
|
|||
#!/bin/bash
|
||||
# Set the SKIP_JOB environment variable if this job is supposed to only run
|
||||
# when submodules are updated and they were not. The following time consuming
|
||||
# tasks will be skipped when the environment variable is present.
|
||||
# Set the SKIP_JOB environment variable if this job is not supposed to run on the current builder.
|
||||
|
||||
set -euo pipefail
|
||||
IFS=$'\n\t'
|
||||
|
||||
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
|
||||
|
||||
if [[ -n "${CI_ONLY_WHEN_SUBMODULES_CHANGED-}" ]]; then
|
||||
git fetch "https://github.com/$GITHUB_REPOSITORY" "$GITHUB_BASE_REF"
|
||||
BASE_COMMIT="$(git merge-base FETCH_HEAD HEAD)"
|
||||
|
||||
echo "Searching for toolstate changes between $BASE_COMMIT and $(git rev-parse HEAD)"
|
||||
|
||||
if git diff "$BASE_COMMIT" | grep --quiet "^index .* 160000"; then
|
||||
# Submodules pseudo-files inside git have the 160000 permissions, so when
|
||||
# those files are present in the diff a submodule was updated.
|
||||
echo "Submodules were updated"
|
||||
elif ! (git diff --quiet "$BASE_COMMIT" -- \
|
||||
src/tools/clippy src/tools/rustfmt src/tools/miri \
|
||||
library/std/src/sys); then
|
||||
# There is not an easy blanket search for subtrees. For now, manually list
|
||||
# the subtrees.
|
||||
# Also run this when the platform-specific parts of std change, in case
|
||||
# that breaks Miri.
|
||||
echo "Tool subtrees were updated"
|
||||
elif ! (git diff --quiet "$BASE_COMMIT" -- \
|
||||
tests/rustdoc-gui \
|
||||
src/librustdoc \
|
||||
src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile \
|
||||
src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version \
|
||||
src/tools/rustdoc-gui); then
|
||||
# There was a change in either rustdoc or in its GUI tests.
|
||||
echo "Rustdoc was updated"
|
||||
else
|
||||
echo "Not executing this job since no submodules nor subtrees were updated"
|
||||
ciCommandSetEnv SKIP_JOB 1
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -n "${CI_ONLY_WHEN_CHANNEL-}" ]]; then
|
||||
if [[ "${CI_ONLY_WHEN_CHANNEL}" = "$(cat src/ci/channel)" ]]; then
|
||||
echo "The channel is the expected one"
|
||||
|
|
|
|||
|
|
@ -23,11 +23,13 @@
|
|||
{%- for theme in themes -%}
|
||||
<link rel="stylesheet" disabled href="{{page.root_path|safe}}{{theme}}{{page.resource_suffix}}.css"> {#- -#}
|
||||
{%- endfor -%}
|
||||
{%- if !layout.default_settings.is_empty() -%}
|
||||
<script id="default-settings" {# -#}
|
||||
{% for (k, v) in layout.default_settings %}
|
||||
data-{{k}}="{{v}}"
|
||||
{%- endfor -%}
|
||||
></script> {#- -#}
|
||||
{%- endif -%}
|
||||
<script src="{{static_root_path|safe}}{{files.storage_js}}"></script> {#- -#}
|
||||
{%- if page.css_class.contains("crate") -%}
|
||||
<script defer src="{{page.root_path|safe}}crates{{page.resource_suffix}}.js"></script> {#- -#}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ const IGNORE_DOCTEST_CHECK: &[&str] = &["E0464", "E0570", "E0601", "E0602", "E06
|
|||
|
||||
// Error codes that don't yet have a UI test. This list will eventually be removed.
|
||||
const IGNORE_UI_TEST_CHECK: &[&str] =
|
||||
&["E0461", "E0465", "E0476", "E0514", "E0523", "E0554", "E0640", "E0717", "E0729"];
|
||||
&["E0461", "E0465", "E0476", "E0514", "E0554", "E0640", "E0717", "E0729"];
|
||||
|
||||
macro_rules! verbose_print {
|
||||
($verbose:expr, $($fmt:tt)*) => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue