From aacd1c2ea38f9692a2404f67255753ea50fdc909 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 13 Dec 2024 20:00:13 -0800 Subject: [PATCH 1/2] Append zeros to toolchain versions truncated by GitHub --- action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/action.yml b/action.yml index b050545..5281d42 100644 --- a/action.yml +++ b/action.yml @@ -41,6 +41,8 @@ runs: fi elif [[ $toolchain =~ ^stable' 'minus' '[0-9]+' 'releases?$ ]]; then echo "toolchain=1.$((($(date +%s)/60/60/24-16569)/7/6-${toolchain//[^0-9]/}))" >> $GITHUB_OUTPUT + 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 echo "toolchain=$toolchain" >> $GITHUB_OUTPUT fi From 9270f2c5cd5ac910732ea93018e1a21068831cb6 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 13 Dec 2024 20:52:47 -0800 Subject: [PATCH 2/2] toolchain: 1.20.0 --- action.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/action.yml b/action.yml index 5281d42..13ee764 100644 --- a/action.yml +++ b/action.yml @@ -6,9 +6,6 @@ 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 @@ -47,7 +44,7 @@ runs: echo "toolchain=$toolchain" >> $GITHUB_OUTPUT fi env: - toolchain: ${{inputs.toolchain}} + toolchain: 1.20.0 shell: bash - id: flags