about summary refs log tree commit diff
path: root/ci
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-08-17T08·48+0100
committerWilliam Carroll <wpcarro@gmail.com>2020-08-20T10·26+0100
commit7833632a7961038e8898ef287fd2dedf8fa7f33b (patch)
tree2c7cc90e0eda2900314fdec02bbfddc1b55f7f1e /ci
parent51cdb872237c86f33a14a845f62a6ee5f267bed6 (diff)
Attempt nix-build instead of nixos-rebuild switch
I've encountered a few problems with attempting to support nixos-rebuild:
- the activation step requires `sudo` privileges
- the `buildkite-agent` runs on the same machine, socrates, that is rebuilding
  itself. This means that when the activation step runs, it will attempt to
  restart `buildkite-agent` when the agent is still working

I'm slowly removing places in my nix code that rely on '<bracket>' notation, so
that I no longer depend on NIX_PATH being set. I still have more work to do.

{covid-uk,sandbox}/default.nix are breaking when I attempt to run my
build-socrates.sh script locally, so I'm temporarily disabling them until I can
get CI working as I expect.
Diffstat (limited to 'ci')
-rw-r--r--ci/scripts/build-socrates.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/ci/scripts/build-socrates.sh b/ci/scripts/build-socrates.sh
index f89b9e657501..f62f97e89951 100644
--- a/ci/scripts/build-socrates.sh
+++ b/ci/scripts/build-socrates.sh
@@ -1,8 +1,6 @@
 set -euo pipefail
 
-nixos-rebuild \
-  -I nixos-config=/home/wpcarro/briefcase/nixos/socrates/configuration.nix \
-  -I nixpkgs=/home/wpcarro/nixpkgs \
-  -I depot=/home/wpcarro/depot \
-  -I briefcase=/home/wpcarro/briefcase \
-  switch
+nix-build /home/wpcarro/nixpkgs/nixos \
+  -I nixos-config=/home/wpcarro/briefcase/nixos/socrates/default.nix \
+  -A system \
+  --show-trace