From df76cb764d947c6f7d323f0210685c374614f587 Mon Sep 17 00:00:00 2001 From: Steve Taylor Date: Wed, 7 Dec 2022 15:11:57 -0700 Subject: [PATCH] Look for correct rust-version variable in toml --- Cargo.toml | 2 +- action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1102383..57d7bfd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ description = "Pyrsia Node and CLI" authors = ["pyrsiaoss "] license = "Apache-2" repository = "https://github.com/pyrsia/pyrsia" -rust = "1.65" +rust-version = "1.64" [package.metadata.deb] assets = [ diff --git a/action.yml b/action.yml index 01e5684..612a3e1 100644 --- a/action.yml +++ b/action.yml @@ -15,7 +15,7 @@ runs: set -e # Install toml to json cli npm i -g toml-cli - echo "RUST_VERSION=$(cat Cargo.toml 2>/dev/null | toml | jq -r 'try(.package.rust) // "stable"')" >> $GITHUB_ENV + echo "RUST_VERSION=$(cat Cargo.toml 2>/dev/null | toml | jq -r 'try(.package."rust-version") // try(.package."rust") // "stable"')" >> $GITHUB_ENV # Clean older versions of rustfmt and cargo-fmt to prevent warnings rm -f /home/runner/.cargo/bin/rustfmt rm -f /home/runner/.cargo/bin/cargo-fmt