From b3df707421f045eb59e29079f6db11713fa92904 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sat, 20 Mar 2021 03:12:05 +0000
Subject: [PATCH] gitlab-ci: try to see if we can parse out the system

---
 .gitlab-ci.yml | 3 +++
 hack/deploy.sh | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e14548c77..4e9b0a7a0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,9 @@ nixCache:
 
 .deploy:
   stage: deploy
+  needs:
+    - job: nixCache
+      artifacts: true
   tags:
     - deployer
 
diff --git a/hack/deploy.sh b/hack/deploy.sh
index f7a91bd5cb..c0936e401a 100755
--- a/hack/deploy.sh
+++ b/hack/deploy.sh
@@ -12,6 +12,9 @@ ssh_cmd="ssh -o StrictHostKeyChecking=accept-new"
 
 if [ ! -z ${2+x} ]; then ssh_cmd="$ssh_cmd $2"; fi
 
+system="$(nix run nixpkgs.jq -c jq -r ".[\"${1}\"]" systems.json)"
+echo System is $system
+
 echo Syncing repo content to machine "$1"
 rsync -e "$ssh_cmd" -avz --exclude='.hg/store/data/' --exclude='.hg/store/dh/' --exclude='.hg/cache/' --exclude='.hg/wcache/' ./ "deployer@$1:depot/"