1
Fork 0

Run the tools builder on all PRs

Previously, it would only run on changes to subtrees, submodules, or select directories.
That made it so that changes to the compiler that broke tools would only be detected on a full bors merge.
This makes it so the tools builder runs by default, making it easier to catch breaking changes to clippy (which was the most effected).
This commit is contained in:
Joshua Nelson 2023-02-05 13:53:39 -06:00
parent 319b88c463
commit 9dfec5d35b
3 changed files with 2 additions and 40 deletions

View file

@ -60,9 +60,8 @@ jobs:
env: {} env: {}
- name: x86_64-gnu-tools - name: x86_64-gnu-tools
tidy: false tidy: false
env:
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
os: ubuntu-20.04-xl os: ubuntu-20.04-xl
env: {}
timeout-minutes: 600 timeout-minutes: 600
runs-on: "${{ matrix.os }}" runs-on: "${{ matrix.os }}"
steps: steps:

View file

@ -307,8 +307,6 @@ jobs:
- name: x86_64-gnu-tools - name: x86_64-gnu-tools
<<: *job-linux-xl <<: *job-linux-xl
tidy: false tidy: false
env:
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
auto: auto:
permissions: permissions:

View file

@ -1,46 +1,11 @@
#!/bin/bash #!/bin/bash
# Set the SKIP_JOB environment variable if this job is supposed to only run # Set the SKIP_JOB environment variable if this job is not supposed to run on the current builder.
# when submodules are updated and they were not. The following time consuming
# tasks will be skipped when the environment variable is present.
set -euo pipefail set -euo pipefail
IFS=$'\n\t' IFS=$'\n\t'
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" 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 [[ -n "${CI_ONLY_WHEN_CHANNEL-}" ]]; then
if [[ "${CI_ONLY_WHEN_CHANNEL}" = "$(cat src/ci/channel)" ]]; then if [[ "${CI_ONLY_WHEN_CHANNEL}" = "$(cat src/ci/channel)" ]]; then
echo "The channel is the expected one" echo "The channel is the expected one"