From 19f306a1835395b229885528412a6e27fff9273b Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Thu, 20 Jun 2024 16:10:55 +0200
Subject: [PATCH] fix: wip new pipeline
---
.gitlab-ci.yml | 5 +++--
nix/scripts/release.nix | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a091114c7..4e9154399 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 3e32de7d1..705c00259 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"
--
GitLab