From d8f14cd212a985b867b4154b35173bdf00ef2f71 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 8 Aug 2021 20:03:44 +0200 Subject: [PATCH 1/3] nix: use `eachDefaultSystem` Otherwise `nix flake check` breaks... --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fab424b..233f242 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ }; outputs = { self, nixpkgs, futils } @ inputs: - futils.lib.eachSystem futils.lib.allSystems (system: + futils.lib.eachDefaultSystem (system: let inherit (nixpkgs) lib; pkgs = nixpkgs.legacyPackages.${system}; From 2a856bd2314531b1e2fc3808abcaa2d7aeed42db Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 8 Aug 2021 20:04:13 +0200 Subject: [PATCH 2/3] ci: add check step --- .drone.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index 880228d..ea339c3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,10 @@ steps: commands: - nix develop -c make +- name: check + commands: + - nix flake check + - name: deploy commands: - nix run github:ambroisie/nix-config#drone-scp From d73cadf0c3088537c27023f6e7ae1ebd43d3c5be Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 8 Aug 2021 20:05:11 +0200 Subject: [PATCH 3/3] ci: fix path to build output --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index ea339c3..8e8324a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,8 +15,7 @@ steps: commands: - nix run github:ambroisie/nix-config#drone-scp environment: - SCP_SOURCE: /drone/src/*.pdf - SCP_STRIP_COMPONENTS: 2 # Make sure the tarball doesn't contain leading path + SCP_SOURCE: '*.pdf' SCP_RM: true # Make sure only the newly generated files are left SCP_HOST: from_secret: ssh_host