Skip to content

Commit

Permalink
Look for correct rust-version variable in toml
Browse files Browse the repository at this point in the history
  • Loading branch information
sbtaylor15 committed Dec 7, 2022
1 parent 7fea98d commit df76cb7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description = "Pyrsia Node and CLI"
authors = ["pyrsiaoss <[email protected]>"]
license = "Apache-2"
repository = "https://github.com/pyrsia/pyrsia"
rust = "1.65"
rust-version = "1.64"

[package.metadata.deb]
assets = [
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit df76cb7

Please sign in to comment.