Skip to content

Commit 12d37e6

Browse files
committed
add the x86_64-gnu-stable job to test with stable channel
During the 1.52 release process we had to deal with some commits that passed the test suite on the nightly branch but failed on the beta or stable branch. In that case it was due to some UI tests including the channel name in the output, but other changes might also be dependent on the channel. This commit adds a new CI job that runs the Linux x86_64 test suite with the stable branch, ensuring nightly changes also work as stable.
1 parent b52bf1b commit 12d37e6

File tree

4 files changed

+22
-1
lines changed

4 files changed

+22
-1
lines changed

.github/workflows/ci.yml

+5
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,11 @@ jobs:
259259
- name: x86_64-gnu
260260
os: ubuntu-latest-xl
261261
env: {}
262+
- name: x86_64-gnu-stable
263+
env:
264+
IMAGE: x86_64-gnu
265+
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
266+
os: ubuntu-latest-xl
262267
- name: x86_64-gnu-aux
263268
os: ubuntu-latest-xl
264269
env: {}

src/ci/docker/run.sh

+1
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ docker \
235235
--env TOOLSTATE_REPO_ACCESS_TOKEN \
236236
--env TOOLSTATE_REPO \
237237
--env TOOLSTATE_PUBLISH \
238+
--env RUST_CI_OVERRIDE_RELEASE_CHANNEL \
238239
--env CI_JOB_NAME="${CI_JOB_NAME-$IMAGE}" \
239240
--init \
240241
--rm \

src/ci/github-actions/ci.yml

+11
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,17 @@ jobs:
407407
- name: x86_64-gnu
408408
<<: *job-linux-xl
409409

410+
# This job ensures commits landing on nightly still pass the full
411+
# test suite on the stable channel. There are some UI tests that
412+
# depend on the channel being built (for example if they include the
413+
# channel name on the output), and this builder prevents landing
414+
# changes that would result in broken builds after a promotion.
415+
- name: x86_64-gnu-stable
416+
env:
417+
IMAGE: x86_64-gnu
418+
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
419+
<<: *job-linux-xl
420+
410421
- name: x86_64-gnu-aux
411422
<<: *job-linux-xl
412423

src/ci/run.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@ fi
6565
# Always set the release channel for bootstrap; this is normally not important (i.e., only dist
6666
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting
6767
# master, beta, or stable with a build to determine whether to run some checks (notably toolstate).
68-
export RUST_RELEASE_CHANNEL="$(cat "${ci_dir}/channel")"
68+
if [[ -z "${RUST_CI_OVERRIDE_RELEASE_CHANNEL+x}" ]]; then
69+
export RUST_RELEASE_CHANNEL="$(cat "${ci_dir}/channel")"
70+
else
71+
export RUST_RELEASE_CHANNEL="${RUST_CI_OVERRIDE_RELEASE_CHANNEL}"
72+
fi
6973
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
7074

7175
if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then

0 commit comments

Comments
 (0)