Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch nixos:main into dmarc-spf-changes

Browse source
This commit is contained in:
esy 2024-06-15 14:17:17 +00:00
commit 9e90553a6b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -30,7 +30,7 @@ update:
# the part that updates the flake # the part that updates the flake
- nix --experimental-features 'nix-command flakes' flake lock --update-input $PACKAGE_NAME - nix --experimental-features 'nix-command flakes' flake lock --update-input $PACKAGE_NAME
- git add flake.lock - git add flake.lock
- git commit -m "[skip ci] Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit" - git commit -m "Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit"
# we have a custom domain # we have a custom domain
- git remote rm origin && git remote add origin ssh://git@gitlab.skynet.ie:2222/compsoc1/skynet/nixos.git - git remote rm origin && git remote add origin ssh://git@gitlab.skynet.ie:2222/compsoc1/skynet/nixos.git
- git push origin HEAD:$CI_COMMIT_REF_NAME - git push origin HEAD:$CI_COMMIT_REF_NAME
@ -51,10 +51,11 @@ sync_repos:
- if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
changes: changes:
- sync/repos.csv - sync/repos.csv
- if: $UPDATE_FLAKE == "yes"
when: never
.scripts_base: &scripts_base .scripts_base: &scripts_base
# load nix environment # load nix environment
- git pull origin $CI_COMMIT_REF_NAME
- . "$HOME/.nix-profile/etc/profile.d/nix.sh" - . "$HOME/.nix-profile/etc/profile.d/nix.sh"
- nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#colmena - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#colmena
@ -85,6 +86,8 @@ sync_repos:
- flake.* - flake.*
- .gitlab-ci.yml - .gitlab-ci.yml
- config/**/* - config/**/*
- if: $UPDATE_FLAKE == "yes"
when: never
# deploy items only run on main # deploy items only run on main
.deploy_template: &deployment .deploy_template: &deployment
@ -101,6 +104,8 @@ sync_repos:
- machines/**/* - machines/**/*
- secrets/**/* - secrets/**/*
- config/**/* - config/**/*
- if: $UPDATE_FLAKE == "yes"
when: never
linter: linter:
<<: *builder <<: *builder
@ -154,7 +159,6 @@ deploy_ext:
- deploy_dns - deploy_dns
script: script:
- colmena apply -v --on @active-ext - colmena apply -v --on @active-ext
allow_failure: true
deploy_gitlab: deploy_gitlab:
<<: *builder <<: *builder