mirror of
https://github.com/rust-lang/rust
synced 2024-09-05 16:57:03 +00:00
add CI_ONLY_WHEN_CHANNEL and run x86_64-gnu-stable only on nightly
This commit is contained in:
parent
eba3228b2a
commit
4b5ac09e32
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
|
@ -263,6 +263,7 @@ jobs:
|
|||
env:
|
||||
IMAGE: x86_64-gnu
|
||||
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
|
||||
CI_ONLY_WHEN_CHANNEL: nightly
|
||||
os: ubuntu-latest-xl
|
||||
- name: x86_64-gnu-aux
|
||||
os: ubuntu-latest-xl
|
||||
|
|
|
@ -416,6 +416,10 @@ jobs:
|
|||
env:
|
||||
IMAGE: x86_64-gnu
|
||||
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
|
||||
# Only run this job on the nightly channel. Running this on beta
|
||||
# could cause failures when `dev: 1` in `stage0.txt`, and running
|
||||
# this on stable is useless.
|
||||
CI_ONLY_WHEN_CHANNEL: nightly
|
||||
<<: *job-linux-xl
|
||||
|
||||
- name: x86_64-gnu-aux
|
||||
|
|
|
@ -8,31 +8,43 @@ IFS=$'\n\t'
|
|||
|
||||
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
|
||||
|
||||
if [[ -z "${CI_ONLY_WHEN_SUBMODULES_CHANGED+x}" ]]; then
|
||||
echo "Executing the job since there is no skip rule in effect"
|
||||
exit 0
|
||||
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; then
|
||||
# There is not an easy blanket search for subtrees. For now, manually list
|
||||
# the subtrees.
|
||||
echo "Clippy or rustfmt subtrees were updated"
|
||||
elif ! (git diff --quiet "$BASE_COMMIT" -- \
|
||||
src/test/rustdoc-gui \
|
||||
src/librustdoc \
|
||||
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
|
||||
|
||||
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 "Executing the job since submodules are updated"
|
||||
elif ! git diff --quiet "$BASE_COMMIT" -- src/tools/clippy src/tools/rustfmt; then
|
||||
# There is not an easy blanket search for subtrees. For now, manually list
|
||||
# the subtrees.
|
||||
echo "Executing the job since clippy or rustfmt subtree was updated"
|
||||
elif ! (git diff --quiet "$BASE_COMMIT" -- \
|
||||
src/test/rustdoc-gui \
|
||||
src/librustdoc \
|
||||
src/tools/rustdoc-gui); then
|
||||
# There was a change in either rustdoc or in its GUI tests.
|
||||
echo "Executing the job since rustdoc was updated"
|
||||
else
|
||||
echo "Not executing this job since no submodules nor subtrees were updated"
|
||||
ciCommandSetEnv SKIP_JOB 1
|
||||
if [[ -n "${CI_ONLY_WHEN_CHANNEL-}" ]]; then
|
||||
if [[ "${CI_ONLY_WHEN_CHANNEL}" = "$(cat src/ci/channel)" ]]; then
|
||||
echo "The channel is the expected one"
|
||||
else
|
||||
echo "Not executing this job as the channel is not the expected one"
|
||||
ciCommandSetEnv SKIP_JOB 1
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
echo "Executing the job since there is no skip rule preventing the execution"
|
||||
exit 0
|
||||
|
|
Loading…
Reference in a new issue