From 0b5f794ebfab77a07de34e18cb40110a948ea6e2 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Wed, 19 Jun 2024 20:41:01 +0200
Subject: [PATCH] fix: wip new pipeline
---
.gitlab-ci.yml | 17 ++++++++++-------
nix/scripts/release.nix | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06dd2eeb0..b0191dc37 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 c5fe369b4..07bc2b4d8 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"
''
--
GitLab