From 0b74408fccebb22e01fba0c5616b03d789781db5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 7 Apr 2025 12:43:55 +0200 Subject: [PATCH 1/4] update lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a691adf..7cfad76 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { -- 2.45.3 From 1a2f0bef7253ff6996c63ca3ad68fa9c01b0da1a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 7 Apr 2025 13:08:49 +0200 Subject: [PATCH 2/4] ci: add caching via volumes --- .woodpecker/cargo_check.yaml | 7 +++++-- .woodpecker/cargo_clippy.yaml | 5 ++++- .woodpecker/cargo_test.yaml | 5 ++++- .woodpecker/check_fmt.yaml | 5 ++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.woodpecker/cargo_check.yaml b/.woodpecker/cargo_check.yaml index 557ee6c..bf57e90 100644 --- a/.woodpecker/cargo_check.yaml +++ b/.woodpecker/cargo_check.yaml @@ -3,7 +3,10 @@ when: steps: - name: "Run cargo check" - image: docker.nix-community.org/nixpkgs/nix-flakes + image: nixos/nix commands: - - nix shell github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix shell --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc - cargo check --workspace --all-targets + volumes: + - /nix:/mnt/nix:ro diff --git a/.woodpecker/cargo_clippy.yaml b/.woodpecker/cargo_clippy.yaml index dd4c38e..c1bba3c 100644 --- a/.woodpecker/cargo_clippy.yaml +++ b/.woodpecker/cargo_clippy.yaml @@ -5,5 +5,8 @@ steps: - name: "Run cargo clippy" image: docker.nix-community.org/nixpkgs/nix-flakes commands: - - nix shell github:nixos/nixpkgs/nixos-unstable#clippy github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix shell --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt github:nixos/nixpkgs/nixos-unstable#clippy github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc - cargo clippy + volumes: + - /nix:/mnt/nix:ro diff --git a/.woodpecker/cargo_test.yaml b/.woodpecker/cargo_test.yaml index 6c5d3fb..d4cf5ff 100644 --- a/.woodpecker/cargo_test.yaml +++ b/.woodpecker/cargo_test.yaml @@ -5,5 +5,8 @@ steps: - name: "Run cargo test" image: docker.nix-community.org/nixpkgs/nix-flakes commands: - - nix shell github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix shell --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc - cargo test --workspace --all-targets + volumes: + - /nix:/mnt/nix:ro diff --git a/.woodpecker/check_fmt.yaml b/.woodpecker/check_fmt.yaml index 5e95d46..b575b8b 100644 --- a/.woodpecker/check_fmt.yaml +++ b/.woodpecker/check_fmt.yaml @@ -5,4 +5,7 @@ steps: - name: "Run treefmt" image: docker.nix-community.org/nixpkgs/nix-flakes commands: - - nix fmt -- --fail-on-change + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix fmt --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt -- --fail-on-change + volumes: + - /nix:/mnt/nix:ro -- 2.45.3 From 023b59a969c357e3a2c2d059ec22d4054eaea2d1 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 7 Apr 2025 13:29:48 +0200 Subject: [PATCH 3/4] use nix develop --- .woodpecker/cargo_check.yaml | 2 +- .woodpecker/cargo_clippy.yaml | 2 +- .woodpecker/cargo_test.yaml | 2 +- flake.nix | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.woodpecker/cargo_check.yaml b/.woodpecker/cargo_check.yaml index bf57e90..fe50deb 100644 --- a/.woodpecker/cargo_check.yaml +++ b/.woodpecker/cargo_check.yaml @@ -6,7 +6,7 @@ steps: image: nixos/nix commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - - nix shell --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc + - nix develop --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt - cargo check --workspace --all-targets volumes: - /nix:/mnt/nix:ro diff --git a/.woodpecker/cargo_clippy.yaml b/.woodpecker/cargo_clippy.yaml index c1bba3c..860530a 100644 --- a/.woodpecker/cargo_clippy.yaml +++ b/.woodpecker/cargo_clippy.yaml @@ -6,7 +6,7 @@ steps: image: docker.nix-community.org/nixpkgs/nix-flakes commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - - nix shell --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt github:nixos/nixpkgs/nixos-unstable#clippy github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc + - nix develop --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt - cargo clippy volumes: - /nix:/mnt/nix:ro diff --git a/.woodpecker/cargo_test.yaml b/.woodpecker/cargo_test.yaml index d4cf5ff..b8fdb8f 100644 --- a/.woodpecker/cargo_test.yaml +++ b/.woodpecker/cargo_test.yaml @@ -6,7 +6,7 @@ steps: image: docker.nix-community.org/nixpkgs/nix-flakes commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - - nix shell --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc + - nix develop --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt - cargo test --workspace --all-targets volumes: - /nix:/mnt/nix:ro diff --git a/flake.nix b/flake.nix index c90bed3..80217dd 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ nodejs cargo clippy + gcc ]; }; } -- 2.45.3 From 6154f3f5fa60003f139e7c7d6f842af856c36c06 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 7 Apr 2025 13:43:06 +0200 Subject: [PATCH 4/4] use a nix package as test --- .woodpecker/build_backend.yaml | 11 +++++++++++ .woodpecker/cargo_clippy.yaml | 2 +- .woodpecker/cargo_test.yaml | 2 +- .woodpecker/check_fmt.yaml | 2 +- flake.nix | 22 ++++++++++++++++++++++ 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 .woodpecker/build_backend.yaml diff --git a/.woodpecker/build_backend.yaml b/.woodpecker/build_backend.yaml new file mode 100644 index 0000000..9471e62 --- /dev/null +++ b/.woodpecker/build_backend.yaml @@ -0,0 +1,11 @@ +when: + - event: pull_request + +steps: + - name: "Run cargo test" + image: nixos/nix + commands: + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix build --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt .#backend + volumes: + - /nix:/mnt/nix:ro diff --git a/.woodpecker/cargo_clippy.yaml b/.woodpecker/cargo_clippy.yaml index 860530a..9c9e998 100644 --- a/.woodpecker/cargo_clippy.yaml +++ b/.woodpecker/cargo_clippy.yaml @@ -3,7 +3,7 @@ when: steps: - name: "Run cargo clippy" - image: docker.nix-community.org/nixpkgs/nix-flakes + image: nixos/nix commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix develop --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt diff --git a/.woodpecker/cargo_test.yaml b/.woodpecker/cargo_test.yaml index b8fdb8f..997358e 100644 --- a/.woodpecker/cargo_test.yaml +++ b/.woodpecker/cargo_test.yaml @@ -3,7 +3,7 @@ when: steps: - name: "Run cargo test" - image: docker.nix-community.org/nixpkgs/nix-flakes + image: nixos/nix commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix develop --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt diff --git a/.woodpecker/check_fmt.yaml b/.woodpecker/check_fmt.yaml index b575b8b..33cd34e 100644 --- a/.woodpecker/check_fmt.yaml +++ b/.woodpecker/check_fmt.yaml @@ -3,7 +3,7 @@ when: steps: - name: "Run treefmt" - image: docker.nix-community.org/nixpkgs/nix-flakes + image: nixos/nix commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix fmt --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt -- --fail-on-change diff --git a/flake.nix b/flake.nix index 80217dd..7cabc64 100644 --- a/flake.nix +++ b/flake.nix @@ -80,6 +80,28 @@ }; }; }; + backend = pkgs.rustPlatform.buildRustPackage rec { + pname = "backend"; + version = "0.1"; + + src = pkgs.lib.fileset.toSource { + root = ./.; + fileset = pkgs.lib.fileset.unions [ + ./Cargo.lock + ./Cargo.toml + ./crates + ./.cargo + ]; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + meta = { + mainProgram = "backend"; + }; + }; } ); formatter = forSystems ( -- 2.45.3