Compare commits

..
1 Commits
Author SHA1 Message Date
David Tolnay e763ec4895 Restore comment as not a comment 2025-08-22 17:57:51 -07:00
4 changed files with 49 additions and 88 deletions
+2 -17
View File
@@ -17,14 +17,14 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest, windows-11-arm, ubuntu-24.04-arm]
os: [ubuntu-latest, macos-latest, windows-latest, windows-11-arm, ubuntu-22.04-arm]
rust: [nightly, beta, stable, 1.62.0, stable 18 months ago, stable minus 8 releases]
include:
- os: ubuntu-latest
rust: 1.0.0
timeout-minutes: 45
steps:
- uses: actions/checkout@v7
- uses: actions/checkout@v4
- uses: ./
name: Run dtolnay/rust-toolchain${{contains(matrix.rust, ' ') && ' for ' || '@'}}${{matrix.rust}}
id: toolchain
@@ -43,18 +43,3 @@ jobs:
if: matrix.rust == 'nightly' || matrix.rust == 'beta' || matrix.rust == 'stable'
- run: cargo check
if: matrix.rust == 'nightly' || matrix.rust == 'beta' || matrix.rust == 'stable'
non-host:
name: Non-host toolchain on Windows
runs-on: windows-latest
timeout-minutes: 45
steps:
- uses: actions/checkout@v7
- uses: ./
with:
toolchain: stable-i686-pc-windows-msvc
- name: Check the active toolchain and compiler host
run: |
test "$(rustup show active-toolchain)" = "stable-i686-pc-windows-msvc (default)"
rustc --version --verbose | grep -Fx 'host: i686-pc-windows-msvc'
shell: bash
+1 -1
View File
@@ -16,7 +16,7 @@ jobs:
name: cargo test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- run: cargo test --all-features
```
+43 -67
View File
@@ -6,6 +6,9 @@ branding:
color: purple
inputs:
toolchain:
description: Rust toolchain specification -- see https://rust-lang.github.io/rustup/concepts/toolchains.html#toolchain-specification
required: true
targets:
description: Comma-separated list of target triples to install for this toolchain
required: false
@@ -28,10 +31,10 @@ runs:
using: composite
steps:
- id: parse
name: Parse toolchain version
run: |
: parse toolchain version
if [[ -z $toolchain ]]; then
# GitHub does not enforce `required: true` inputs itself. https://github.com/actions/runner/issues/1070
: GitHub does not enforce 'required: true' inputs itself. https://github.com/actions/runner/issues/1070
echo "'toolchain' is a required input" >&2
exit 1
elif [[ $toolchain =~ ^stable' '[0-9]+' '(year|month|week|day)s?' 'ago$ ]]; then
@@ -45,20 +48,30 @@ runs:
elif [[ $toolchain =~ ^1\.[0-9]+$ ]]; then
echo "toolchain=1.$((i=${toolchain#1.}, c=($(date +%s)/60/60/24-16569)/7/6, i+9*i*(10*i<=c)+90*i*(100*i<=c)))" >> $GITHUB_OUTPUT
else
delimiter=EOF
while [[ $toolchain == *$delimiter* ]]; do delimiter+=_; done
printf 'toolchain<<%s\n%s\n%s\n' "$delimiter" "$toolchain" "$delimiter" >> $GITHUB_OUTPUT
echo "toolchain=$toolchain" >> $GITHUB_OUTPUT
fi
env:
toolchain: 1.26.2
toolchain: ${{inputs.toolchain}}
shell: bash
- name: Set $CARGO_HOME
run: echo CARGO_HOME=${CARGO_HOME:-"${{runner.os == 'Windows' && '$USERPROFILE\.cargo' || '$HOME/.cargo'}}"} >> $GITHUB_ENV
shell: bash
- name: Install rustup if needed
- id: flags
run: |
: construct rustup command line
echo "targets=$(for t in ${targets//,/ }; do echo -n ' --target' $t; done)" >> $GITHUB_OUTPUT
echo "components=$(for c in ${components//,/ }; do echo -n ' --component' $c; done)" >> $GITHUB_OUTPUT
echo "downgrade=${{steps.parse.outputs.toolchain == 'nightly' && inputs.components && ' --allow-downgrade' || ''}}" >> $GITHUB_OUTPUT
env:
targets: ${{inputs.targets || inputs.target || ''}}
components: ${{inputs.components}}
shell: bash
- run: |
: set $CARGO_HOME
echo CARGO_HOME=${CARGO_HOME:-"${{runner.os == 'Windows' && '$USERPROFILE\.cargo' || '$HOME/.cargo'}}"} >> $GITHUB_ENV
shell: bash
- run: |
: install rustup if needed
if ! command -v rustup &>/dev/null; then
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail https://sh.rustup.rs | sh -s -- --default-toolchain none -y
echo "$CARGO_HOME/bin" >> $GITHUB_PATH
@@ -66,8 +79,8 @@ runs:
if: runner.os != 'Windows'
shell: bash
- name: Install rustup if needed on windows
run: |
- run: |
: install rustup if needed on windows
if ! command -v rustup &>/dev/null; then
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail https://win.rustup.rs/${{runner.arch == 'ARM64' && 'aarch64' || 'x86_64'}} --output '${{runner.temp}}\rustup-init.exe'
'${{runner.temp}}\rustup-init.exe' --default-toolchain none --no-modify-path -y
@@ -77,93 +90,56 @@ runs:
shell: bash
- name: rustup toolchain install ${{steps.parse.outputs.toolchain}}
run: |
set -f # split targets and components on commas and whitespace, without glob expansion
flags=()
for t in ${targets//,/ }; do flags+=(--target "$t"); done
for c in ${components//,/ }; do flags+=(--component "$c"); done
if [[ $toolchain == nightly && -n $components ]]; then flags+=(--allow-downgrade); fi
log=$(mktemp)
trap 'rm -f "$log"' EXIT
for attempt in 1 2 3 4 5; do
if rustup toolchain install "$toolchain" "${flags[@]}" --profile minimal --no-self-update --force-non-host 2>&1 | tee "$log"; then
break
else
status=$?
fi
if [[ $attempt == 5 ]] || ! grep -Fq 'checksum failed for ' "$log" \
|| ! grep -Fq 'this is likely due to an ongoing update of the official release server' "$log"; then
exit "$status"
fi
echo "Retrying rustup toolchain install in 30 seconds (retry $attempt of 4)" >&2
sleep 30
done
env:
toolchain: ${{steps.parse.outputs.toolchain}}
targets: ${{inputs.targets || inputs.target || ''}}
components: ${{inputs.components}}
RUSTUP_PERMIT_COPY_RENAME: 1
run: rustup toolchain install ${{steps.parse.outputs.toolchain}}${{steps.flags.outputs.targets}}${{steps.flags.outputs.components}} --profile minimal${{steps.flags.outputs.downgrade}} --no-self-update
shell: bash
- name: rustup default ${{steps.parse.outputs.toolchain}}
run: rustup default "$toolchain" --force-non-host
env:
toolchain: ${{steps.parse.outputs.toolchain}}
- run: rustup default ${{steps.parse.outputs.toolchain}}
shell: bash
continue-on-error: true # https://github.com/dtolnay/rust-toolchain/issues/127
- id: rustc-version
name: Create cachekey
run: |
DATE=$(rustc +"$toolchain" --version --verbose | sed -ne 's/^commit-date: \(20[0-9][0-9]\)-\([01][0-9]\)-\([0-3][0-9]\)$/\1\2\3/p')
HASH=$(rustc +"$toolchain" --version --verbose | sed -ne 's/^commit-hash: //p')
: create cachekey
DATE=$(rustc +${{steps.parse.outputs.toolchain}} --version --verbose | sed -ne 's/^commit-date: \(20[0-9][0-9]\)-\([01][0-9]\)-\([0-3][0-9]\)$/\1\2\3/p')
HASH=$(rustc +${{steps.parse.outputs.toolchain}} --version --verbose | sed -ne 's/^commit-hash: //p')
echo "cachekey=$(echo $DATE$HASH | head -c12)" >> $GITHUB_OUTPUT
env:
toolchain: ${{steps.parse.outputs.toolchain}}
shell: bash
- name: Disable incremental compilation
run: |
- run: |
: disable incremental compilation
if [ -z "${CARGO_INCREMENTAL+set}" ]; then
echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV
fi
shell: bash
- name: Enable colors in Cargo output
run: |
- run: |
: enable colors in Cargo output
if [ -z "${CARGO_TERM_COLOR+set}" ]; then
echo CARGO_TERM_COLOR=always >> $GITHUB_ENV
fi
shell: bash
- name: Enable Cargo sparse registry
run: |
- run: |
: enable Cargo sparse registry
# implemented in 1.66, stabilized in 1.68, made default in 1.70
if [ -z "${CARGO_REGISTRIES_CRATES_IO_PROTOCOL+set}" -o -f "${{runner.temp}}"/.implicit_cargo_registries_crates_io_protocol ]; then
if rustc +"$toolchain" --version --verbose | grep -q '^release: 1\.6[89]\.'; then
if rustc +${{steps.parse.outputs.toolchain}} --version --verbose | grep -q '^release: 1\.6[89]\.'; then
touch "${{runner.temp}}"/.implicit_cargo_registries_crates_io_protocol || true
echo CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse >> $GITHUB_ENV
elif rustc +"$toolchain" --version --verbose | grep -q '^release: 1\.6[67]\.'; then
elif rustc +${{steps.parse.outputs.toolchain}} --version --verbose | grep -q '^release: 1\.6[67]\.'; then
touch "${{runner.temp}}"/.implicit_cargo_registries_crates_io_protocol || true
echo CARGO_REGISTRIES_CRATES_IO_PROTOCOL=git >> $GITHUB_ENV
fi
fi
env:
toolchain: ${{steps.parse.outputs.toolchain}}
shell: bash
- name: Work around spurious network errors in curl 8.0
run: |
- run: |
: work around spurious network errors in curl 8.0
# https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/timeout.20investigation
if rustc +"$toolchain" --version --verbose | grep -q '^release: 1\.7[01]\.'; then
if rustc +${{steps.parse.outputs.toolchain}} --version --verbose | grep -q '^release: 1\.7[01]\.'; then
echo CARGO_HTTP_MULTIPLEXING=false >> $GITHUB_ENV
fi
env:
toolchain: ${{steps.parse.outputs.toolchain}}
shell: bash
- name: rustc +${{steps.parse.outputs.toolchain}} --version --verbose
run: rustc +"$toolchain" --version --verbose
env:
toolchain: ${{steps.parse.outputs.toolchain}}
- run: rustc +${{steps.parse.outputs.toolchain}} --version --verbose
shell: bash
+3 -3
View File
@@ -11,11 +11,11 @@ patch_releases=(
1.12.1 1.15.1 1.22.1 1.24.1 1.26.1 1.26.2 1.27.1 1.27.2 1.29.1 1.29.2 1.30.1
1.31.1 1.34.1 1.34.2 1.41.1 1.43.1 1.44.1 1.45.1 1.45.2 1.52.1 1.56.1 1.58.1
1.62.1 1.66.1 1.67.1 1.68.1 1.68.2 1.71.1 1.72.1 1.74.1 1.77.1 1.77.2 1.80.1
1.84.1 1.85.1 1.91.1 1.93.1 1.94.1 1.96.1 1.97.1 1.98.1 1.99.1
1.84.1 1.85.1
)
releases() {
printf "%s\n" 1.{0..120}.0 ${patch_releases[@]} | sort -V
printf "%s\n" 1.{0..100}.0 ${patch_releases[@]} | sort -V
}
base=$(git rev-parse HEAD)
@@ -33,7 +33,7 @@ for rev in `releases` stable beta nightly; do
if [[ $rev == 1* ]]; then
sed -i "/^ toolchain:/,+2d; s/\${{inputs\.toolchain}}/$rev/" action.yml
else
sed -i "s/^ required: true$/ required: false\n default: $rev/" action.yml
sed -i "s/required: true/required: false\n default: $rev/" action.yml
fi
git add action.yml
git commit --quiet --message "toolchain: $rev"