diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06dd2eeb0b80c4e7f1f886a5a9481ea791465741..b0191dc37972ed7f28101ddf246f5ef8b5105be3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,24 +50,27 @@ web-tests: artifacts: paths: - screenshot.png - - + rules: + - if: '$CI_COMMIT_TAG == null' + release: stage: release tags: - nixos-gen3 script: - nix develop .#gitlab --command release - when: on_success - + when: on_success + rules: + - if: '$CI_COMMIT_TAG == null' + deploy: stage: deploy tags: - nixos-gen3 script: - - git pull - - nix flake update - nix develop .#gitlab --command build-and-publish - when: on_success + when: on_success + rules: + - if: '$CI_COMMIT_TAG != null' \ No newline at end of file diff --git a/nix/scripts/release.nix b/nix/scripts/release.nix index c5fe369b47582192149b91a79470839db48ad11e..07bc2b4d8fda60aabeb2e0d536c286d28512bbfb 100644 --- a/nix/scripts/release.nix +++ b/nix/scripts/release.nix @@ -78,7 +78,7 @@ in ${pkgs'.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 5 ${pkgs'.git}/bin/git remote set-url origin https://pad:''${GITLAB_TOKEN}@''${CI_REPOSITORY_URL#*@} - ${pkgs'.git}/bin/git push -o ci.skip origin "$CI_COMMIT_REF_NAME" --tags + ${pkgs'.git}/bin/git push "$CI_COMMIT_REF_NAME" --tags echo_ok "done" ''