From 37895e8e389b6787a4a51734f4a6136ec4bc2fbe Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 27 Jul 2023 20:19:33 +0000 Subject: [PATCH] ci: testing --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d821a4..1b15772 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: - deploy variables: - FLAKE_COMMIT: "" + FLAKE_COMMIT: "main" # Update the flake for any changes upstream # Passed in from upstream @@ -46,8 +46,7 @@ build: stage: test before_script: - . "$HOME/.nix-profile/etc/profile.d/nix.sh" - # use the - - git remote rm origin && git remote add origin ssh://git@gitlab.skynet.ie:2222/compsoc/skynet/nixos.git + # use the new flake - git pull origin $FLAKE_COMMIT script: - nix --experimental-features 'nix-command flakes' run nixpkgs#colmena -- build @@ -63,7 +62,6 @@ deploy: - chmod 700 ~/.ssh # load nix environment - . "$HOME/.nix-profile/etc/profile.d/nix.sh" - - git remote rm origin && git remote add origin ssh://git@gitlab.skynet.ie:2222/compsoc/skynet/nixos.git - git pull origin $FLAKE_COMMIT script: # dns is always deployed first