From 878659c4c40b8df2feead5d390ae71a2fc7ebade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com> Date: Sun, 30 Apr 2023 14:56:32 +0100 Subject: [PATCH] fix: removed outdated rust version (1.56.1) This dependency was creating issues with clap>=4. --- .github/workflows/main.yml | 1 - .gitlab-ci.yml | 8 ++++---- Cargo.toml | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cfbfd157..263e1378 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,6 @@ jobs: strategy: matrix: rust-version: [ - "1.56.1", "1.60.0", "1.61.0", "1.62.0", diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef40c2df..f2a84848 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,15 +26,15 @@ build-rust: stage: build parallel: matrix: - - RUST_VERSION: ["1.56.1", "1.60.0", "stable", "nightly"] + - RUST_VERSION: ["1.60.0", "stable", "nightly"] script: - rustup toolchain install $RUST_VERSION - rustup override set $RUST_VERSION - rustup component add rustfmt - rustup component add clippy - rustc --version - - if [[ $RUST_VERSION != "1.56.1" ]]; then cargo fmt --all -- --check; fi - - if [[ $RUST_VERSION != "1.56.1" ]] && [[ $RUST_VERSION != nightly ]]; then cargo clippy -- -D warnings -A unknown-lints; fi + - cargo fmt --all -- --check + - if [[ $RUST_VERSION != nightly ]]; then cargo clippy -- -D warnings -A unknown-lints; fi - cargo build - cargo build --release @@ -60,7 +60,7 @@ test-rust: stage: test parallel: matrix: - - RUST_VERSION: ["1.56.1", "1.60.0", "stable", "nightly"] + - RUST_VERSION: ["1.60.0", "stable", "nightly"] script: - rustup toolchain install $RUST_VERSION - rustup override set $RUST_VERSION diff --git a/Cargo.toml b/Cargo.toml index 17cd7f1c..3c324231 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,10 +35,7 @@ lto = true opt-level = 3 [workspace] -members = [ - ".", - "frontends/sdl", -] +members = [".", "frontends/sdl"] [package.metadata.docs.rs] features = ["wasm", "gen-mock"] -- GitLab