diff options
Diffstat (limited to '')
| -rwxr-xr-x | src/ci/scripts/select-xcode.sh | 13 | ||||
| -rwxr-xr-x | src/ci/scripts/should-skip-this.sh | 8 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/ci/scripts/select-xcode.sh b/src/ci/scripts/select-xcode.sh new file mode 100755 index 000000000..3b9c77d42 --- /dev/null +++ b/src/ci/scripts/select-xcode.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# This script selects the Xcode instance to use. + +set -euo pipefail +IFS=$'\n\t' + +source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" + +if isMacOS; then + if [[ -s "${SELECT_XCODE-}" ]]; then + sudo xcode-select -s "${SELECT_XCODE}" + fi +fi diff --git a/src/ci/scripts/should-skip-this.sh b/src/ci/scripts/should-skip-this.sh index c863f1b68..a8a189931 100755 --- a/src/ci/scripts/should-skip-this.sh +++ b/src/ci/scripts/should-skip-this.sh @@ -18,10 +18,14 @@ if [[ -n "${CI_ONLY_WHEN_SUBMODULES_CHANGED-}" ]]; 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; then + 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. - echo "Clippy or rustfmt subtrees were updated" + # 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" -- \ src/test/rustdoc-gui \ src/librustdoc \ |