diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a091114c7ae77d4e65038016de9663b4b200cc55..4e915439982e146ddfaf31ae974b2a16c13b7d7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,8 @@ tests: tags: - nixos-gen3 script: - - nix develop .#gitlab --command run-ci-tests + - printenv + - nix develop .#gitlab --command run-ci-tests cache: untracked: true key: @@ -73,6 +74,6 @@ deploy: - nix develop .#gitlab --command build-and-publish when: on_success rules: - - if: '$CI_PUSH_OPTION_CI_VARIABLE' + - if: $CI_PUSH_OPTION_CI_VARIABLE when: always \ No newline at end of file diff --git a/nix/scripts/release.nix b/nix/scripts/release.nix index 3e32de7d137445eafd5cd568904433004210da92..705c002592f30bb49e8ef8211fe4e15741c12589 100644 --- a/nix/scripts/release.nix +++ b/nix/scripts/release.nix @@ -68,9 +68,9 @@ in fi if ${pkgs'.git}/bin/git tag -l | grep -q "$gitVersion"; then - echo_step "Tag $gitVersion existiert bereits. Lösche und setze den Tag neu." - ${pkgs'.git}/bin/git tag -d "$gitVersion" - ${pkgs'.git}/bin/git push --push-option= ci.skip origin --delete "$gitVersion" + echo_step "Tag $gitVersion existiert bereits. Lösche und setze den Tag neu." + ${pkgs'.git}/bin/git tag -d "$gitVersion" + ${pkgs'.git}/bin/git push --push-option=ci.skip origin --delete "$gitVersion" fi ${pkgs'.git}/bin/git tag -a "$gitVersion" -m"chore: bump version to $gitVersion"