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/"