aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2019-05-26 19:51:23 -0300
committerEuAndreh <eu@euandre.org>2019-05-26 19:51:23 -0300
commit3595d2518eeae4674fa2b500244951435165a393 (patch)
tree16e3765a1d6bda65717beb5ea07316d582fe24de
parentTODOs.org (diff)
downloadtoph-3595d2518eeae4674fa2b500244951435165a393.tar.gz
toph-3595d2518eeae4674fa2b500244951435165a393.tar.xz
Use nix-shell --pure to run scripts
Instead of adding them to the =packages= section of .build.yml.
-rw-r--r--.build.yml5
-rw-r--r--default.nix10
2 files changed, 11 insertions, 4 deletions
diff --git a/.build.yml b/.build.yml
index 28c79e4..8c22e08 100644
--- a/.build.yml
+++ b/.build.yml
@@ -13,10 +13,11 @@ secrets:
- 7084b7c7-12be-4509-8927-81ba6eeb1fc0
tasks:
- setup: |
- ./vps/ci-setup.sh
+ cd vps/
+ nix-shell --pure --run "bash -c ./ci-setup.sh"
- tests: |
cd vps/
nix-build -A test
- deploy: |
cd vps/
- nix-shell --run "bash -c ./provision.sh"
+ nix-shell --pure --run "bash -c ./provision.sh"
diff --git a/default.nix b/default.nix
index 08568b2..04a9298 100644
--- a/default.nix
+++ b/default.nix
@@ -94,9 +94,15 @@ with pkgs.stdenv; rec {
touch $out
'';
});
- # Used in .build.yml to run ./provision.sh
+ # Used in .build.yml to run Bash scripts
shell = mkShell rec {
name = "vps-shell";
- buildInputs = [ terraform terraform-providers.digitalocean git-crypt ];
+ buildInputs = [
+ gitMinimal
+ git-crypt
+ gettext
+ terraform
+ terraform-providers.digitalocean
+ ];
};
}