diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe3ac75..a802023 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,10 +31,6 @@ update: # we have a custom domain - git remote rm origin && git remote add origin ssh://git@gitlab.skynet.ie:2222/compsoc/skynet/nixos.git - git push origin HEAD:$CI_COMMIT_REF_NAME - # update teh hash for further along in the pipeline - # https://nsirap.com/posts/043-change-value-of-variable-in-gitlab%20copy/ - - printf '%s' "FLAKE_COMMIT=$(git rev-parse HEAD)" >> flake.env - artifacts: reports: dotenv: flake.env only: @@ -48,7 +44,7 @@ build: before_script: - . "$HOME/.nix-profile/etc/profile.d/nix.sh" # use the new flake - - (if [ "$FLAKE_COMMIT" != "" ]; then git pull origin $FLAKE_COMMIT; fi); + - git pull script: - nix --experimental-features 'nix-command flakes' run nixpkgs#colmena -- build @@ -63,7 +59,7 @@ deploy: - chmod 700 ~/.ssh # load nix environment - . "$HOME/.nix-profile/etc/profile.d/nix.sh" - - (if [ "$FLAKE_COMMIT" != "" ]; then git pull origin $FLAKE_COMMIT; fi); + - git pull script: # dns is always deployed first - nix --experimental-features 'nix-command flakes' run nixpkgs#colmena -- apply --on @active-dns