diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 493c9b9..3533038 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ update: - git config --global user.email "${CI_EMAIL}" - git config --global user.name "${CI_USERNAME}" # the part that updates the flake - - nix --experimental-features 'nix-command flakes' flake lock --update-input $PACKAGE_NAME + - nix flake lock --update-input $PACKAGE_NAME - git add flake.lock - git commit -m "[skip ci] Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit" # we have a custom domain @@ -44,6 +44,7 @@ update: # load nix environment - . "$HOME/.nix-profile/etc/profile.d/nix.sh" - git pull origin $CI_COMMIT_REF_NAME + - nix-shell -p colmena .scripts_deploy: &scripts_deploy # setup ssh key @@ -79,7 +80,7 @@ build: <<: *builder stage: test script: - - nix --experimental-features 'nix-command flakes' run nixpkgs#colmena -- build + - colmena build # dns always has to be deployed first deploy_dns: @@ -87,7 +88,7 @@ deploy_dns: <<: *deployment stage: deploy script: - - nix --experimental-features 'nix-command flakes' run nixpkgs#colmena -- apply --on @active-dns + - colmena apply --on @active-dns deploy_core: <<: *builder @@ -96,7 +97,7 @@ deploy_core: needs: - deploy_dns script: - - nix --experimental-features 'nix-command flakes' run nixpkgs#colmena -- apply --on @active-core + - colmena apply --on @active-core deploy_active: <<: *builder @@ -105,12 +106,12 @@ deploy_active: needs: - deploy_dns script: - - nix --experimental-features 'nix-command flakes' run nixpkgs#colmena -- apply --on @active + - colmena apply --on @active deploy_gitlab: <<: *builder <<: *deployment stage: deploy_gitlab script: - - nix --experimental-features 'nix-command flakes' run nixpkgs#colmena -- apply --on @active-gitlab + - colmena apply --on @active-gitlab when: manual \ No newline at end of file