diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4ddf80..8b056ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -177,18 +177,16 @@ jobs: - name: Check typos uses: crate-ci/typos@master + - name: Install cargo-binstall + uses: taiki-e/install-action@cargo-binstall + + - name: Install cargo-msrv + run: cargo binstall -y cargo-msrv + - name: Run cargo-msrv shell: bash run: | - curl -s 'https://api.github.com/repos/foresterre/cargo-msrv/releases' | \ - jq -r "[.[] | select(.prerelease == false)][0].assets[] | \ - select(.name | ascii_downcase | test(\"linux.*x86_64|x86_64.*linux\")).browser_download_url" | \ - wget -qi - - tar -xvf cargo-msrv*.tar* -C ~/.cargo/bin/ cargo-msrv - # Workaround for https://github.com/foresterre/cargo-msrv/issues/590 - for package in $(cargo metadata --format-version 1 --no-deps | jq -r ".workspace_members[]" | awk '{print $1}'); do - version=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name | test("^daktilo$")) | .rust_version') - printf "Checking MSRV $version for $package..." - echo -e "[package.metadata]\nmsrv = \"${version}\"" >> "crates/${package}/Cargo.toml" - cargo msrv --output-format json --path "crates/${package}" verify | tail -n 1 | jq --exit-status '.success' + for package in "daktilo" "daktilo_lib"; do + printf "Checking MSRV for $package..." + cargo msrv --output-format json --path "crates/$package" verify | tail -n 1 | jq --exit-status '.success' done diff --git a/Cargo.toml b/Cargo.toml index 64b5c41..0d59d62 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,6 @@ homepage = "https://github.com/orhun/daktilo" repository = "https://github.com/orhun/daktilo" keywords = ["typewriter", "keyboard", "nostalgic", "type"] categories = ["command-line-utilities", "multimedia"] -rust-version = "1.74.1" edition = "2021" [workspace.dependencies] diff --git a/crates/daktilo/Cargo.toml b/crates/daktilo/Cargo.toml index 3667199..f32c412 100644 --- a/crates/daktilo/Cargo.toml +++ b/crates/daktilo/Cargo.toml @@ -9,9 +9,9 @@ homepage.workspace = true repository.workspace = true keywords.workspace = true categories.workspace = true -rust-version.workspace = true edition.workspace = true default-run = "daktilo" +rust-version = "1.74.1" [features] audio-tests = [] diff --git a/crates/daktilo_lib/Cargo.toml b/crates/daktilo_lib/Cargo.toml index 1baa7fd..ef2f528 100644 --- a/crates/daktilo_lib/Cargo.toml +++ b/crates/daktilo_lib/Cargo.toml @@ -9,8 +9,8 @@ homepage.workspace = true repository.workspace = true keywords.workspace = true categories.workspace = true -rust-version.workspace = true edition.workspace = true +rust-version = "1.74.1" [dependencies] rdev = { version = "0.5.3", features = ["serialize"] }