From 10d739db4fe0e7807d3b3a3d638c941987dcc1fd Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 25 Feb 2024 10:31:36 -0500 Subject: [PATCH 1/7] flake.nix: update build inputs --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index e23bd30..c6be631 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,8 @@ in { devShells.${system}.default = pkgs.mkShell { name = "forcebot_rs-devenv"; + nativeBuildInputs = [pkgs.pkg-config]; + buildInputs = with pkgs; [openssl libiconv]; packages = with pkgs; [ nil alejandra -- 2.46.1 From 38a5e7e5207bfe9b1cf8212bc02984badf0b8f77 Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 25 Feb 2024 10:54:02 -0500 Subject: [PATCH 2/7] ci: add basic cargo ci --- .woodpecker/cargo-checks.yml | 14 ++++++++++++++ .woodpecker/flake-update.yml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .woodpecker/cargo-checks.yml diff --git a/.woodpecker/cargo-checks.yml b/.woodpecker/cargo-checks.yml new file mode 100644 index 0000000..1da2adc --- /dev/null +++ b/.woodpecker/cargo-checks.yml @@ -0,0 +1,14 @@ +when: + - event: pull_request + - event: push + - path: "src/*" + +steps: + cargo_clippy: + image: rustlang/rust + commands: + - cargo clippy + cargo_test: + image: rustlang/rust + commands: + - cargo test diff --git a/.woodpecker/flake-update.yml b/.woodpecker/flake-update.yml index 37d88de..56c672a 100644 --- a/.woodpecker/flake-update.yml +++ b/.woodpecker/flake-update.yml @@ -37,7 +37,7 @@ steps: owner: ${CI_REPO_OWNER} repo: ${CI_REPO_NAME} branch: flake-lock-update - base_branch: master + base_branch: main pr_title: "flake.lock: update" pr_body: PR automatically created by Woodpecker CI close_pr_if_empty: true -- 2.46.1 From bc9fd7585319a065cb54499b18ac64530b32a020 Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 25 Feb 2024 10:54:38 -0500 Subject: [PATCH 3/7] ci: update rust image --- .woodpecker/cargo-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/cargo-checks.yml b/.woodpecker/cargo-checks.yml index 1da2adc..ea83f3d 100644 --- a/.woodpecker/cargo-checks.yml +++ b/.woodpecker/cargo-checks.yml @@ -5,7 +5,7 @@ when: steps: cargo_clippy: - image: rustlang/rust + image: rustlang/rust:nightly commands: - cargo clippy cargo_test: -- 2.46.1 From 9c3318c6f62a589bc8a432a7ae0748e910910b59 Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 25 Feb 2024 10:55:42 -0500 Subject: [PATCH 4/7] ci: update rust image --- .woodpecker/cargo-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/cargo-checks.yml b/.woodpecker/cargo-checks.yml index ea83f3d..f65f227 100644 --- a/.woodpecker/cargo-checks.yml +++ b/.woodpecker/cargo-checks.yml @@ -5,7 +5,7 @@ when: steps: cargo_clippy: - image: rustlang/rust:nightly + image: rust commands: - cargo clippy cargo_test: -- 2.46.1 From 491722bf0f80fb87214bbbfa0616fae035700675 Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 25 Feb 2024 10:59:16 -0500 Subject: [PATCH 5/7] ci: update clippy tests --- .woodpecker/cargo-checks.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.woodpecker/cargo-checks.yml b/.woodpecker/cargo-checks.yml index f65f227..3822312 100644 --- a/.woodpecker/cargo-checks.yml +++ b/.woodpecker/cargo-checks.yml @@ -6,9 +6,11 @@ when: steps: cargo_clippy: image: rust - commands: - - cargo clippy + commands: | + rustup update stable && rustup default stable + rustup component add clippy + cargo clippy --all-targets --all-features cargo_test: - image: rustlang/rust + image: rust commands: - cargo test -- 2.46.1 From 2901d345d65c0b487b029778f10b2f603f9543d0 Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 25 Feb 2024 11:56:54 -0500 Subject: [PATCH 6/7] ci: include *.rs --- .woodpecker/cargo-checks.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/cargo-checks.yml b/.woodpecker/cargo-checks.yml index 4796135..0dca0bc 100644 --- a/.woodpecker/cargo-checks.yml +++ b/.woodpecker/cargo-checks.yml @@ -1,7 +1,8 @@ when: - event: pull_request - event: push - - path: "src/*" + - path: + include: ['*.rs'] steps: cargo_clippy: -- 2.46.1 From ca05de5cd5bb74eb232b2eeafb38a85784927ce9 Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 25 Feb 2024 12:12:53 -0500 Subject: [PATCH 7/7] ci: add rustup step --- .woodpecker/cargo-checks.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.woodpecker/cargo-checks.yml b/.woodpecker/cargo-checks.yml index 0dca0bc..a5248ba 100644 --- a/.woodpecker/cargo-checks.yml +++ b/.woodpecker/cargo-checks.yml @@ -1,17 +1,20 @@ when: - event: pull_request - event: push - - path: - include: ['*.rs'] + - path: + include: ["*.rs"] steps: - cargo_clippy: + configure_rustup: image: rust commands: | rustup update stable && rustup default stable rustup component add clippy - # cargo clippy --all-targets --all-features + cargo_clippy: + image: rust + commands: + - cargo clippy --all-targets --all-features cargo_test: image: rust commands: - - cargo test + - cargo test --all-features -- 2.46.1