[DEVOPS-779] simplify CI setup with buildkite hooks

input-output-hk · Jul 11, 2018 · 80290e5 · 80290e5
1 parent 2261860
commit 80290e5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 32 deletions.
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
@@ -0,0 +1,5 @@
+=======
+set -x
+
+NIX_PATH="nixpkgs=$(nix-build fetch-nixpkgs.nix -o nixpkgs)"
+export NIX_PATH
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,15 +1,15 @@
 steps:
   - label: 'stack2nix'
-    command: 'scripts/ci/nix-shell.sh -p cabal2nix stack cabal-install ghc moreutils expect -Q -j 4 --run scripts/check-stack2nix.sh'
+    command: 'nix-shell -Q -j 4 --run scripts/check-stack2nix.sh'
     agents:
       system: x86_64-linux
 
   - label: 'release.nix'
-    command: 'scripts/ci/nix-shell.sh --run scripts/ci/check-hydra.sh'
+    command: 'nix-shell --run scripts/ci/check-hydra.sh'
     agents:
       system: x86_64-linux
 
   - label: 'explorer frontend: checking generated dependencies'
-    command: 'scripts/ci/nix-shell.sh --run "cd explorer/frontend && ./nix/generate-frontend-deps.hs --test"'
+    command: "cd explorer/frontend && ./nix/generate-frontend-deps.hs --test"
     agents:
       system: x86_64-linux
diff --git a/pkgs/generate.sh b/pkgs/generate.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash
+#!nix-shell -i bash -p bash cabal2nix stack cabal-install ghc
 
 # regenerate the `pkgs/default.nix` file based on the current contents of cardano-sl.cabal and stack.yaml
 

diff --git a/scripts/check-stack2nix.sh b/scripts/check-stack2nix.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p git bash
 
 # check and warn if `pkgs/default.nix` is out of date
 

diff --git a/scripts/ci/nix-shell.sh b/scripts/ci/nix-shell.sh