From d2e2cc7fcad35cbb3189d1f51bf01bed57e7beaa Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 10 May 2022 19:28:33 -0700 Subject: i don't think it will work --- users/fcuny/blog/.drone.yml | 2 +- users/fcuny/blog/flake.nix | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/users/fcuny/blog/.drone.yml b/users/fcuny/blog/.drone.yml index 67bf620..0031ad9 100644 --- a/users/fcuny/blog/.drone.yml +++ b/users/fcuny/blog/.drone.yml @@ -14,4 +14,4 @@ steps: FLY_API_TOKEN: from_secret: FLY_API_TOKEN commands: - - nix shell --command bash ./scripts/deploy.sh + - nix run .#deploy diff --git a/users/fcuny/blog/flake.nix b/users/fcuny/blog/flake.nix index 7d5a4b2..1c9b9dd 100644 --- a/users/fcuny/blog/flake.nix +++ b/users/fcuny/blog/flake.nix @@ -22,6 +22,7 @@ ''; dontInstall = true; }; + defaultApp = pkgs.writers.writeBashBin "run-hugo" '' set -e set -o pipefail @@ -29,14 +30,15 @@ hugo server -D ''; - deploy = pkgs.writers.writeBashBin "run-deploy" '' - set -e - set -o pipefile - export PATH=${ - pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git pkgs.jq pkgs.flyctl ] - } - ./scripts/deploy.sh - ''; + apps = { + deploy = pkgs.pkgs.writeShellScriptBin "run-deploy" '' + set -euxo pipefail + export PATH=${ + pkgs.lib.makeBinPath [ pkgs.hugo pkgs.git pkgs.jq pkgs.flyctl ] + }:$PATH + ./scripts/deploy.sh + ''; + }; devShell = pkgs.mkShell { buildInputs = with pkgs; [ hugo flyctl git jq ]; }; -- cgit 1.4.1