From fa02babc955e347890b84792d879ddb3a5134a66 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Wed, 3 Jan 2024 19:43:33 +0100
Subject: [PATCH] fix: test gorelease
---
.gitlab-ci.yml | 5 +++--
devenv.nix | 9 +++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5261d1e..878338a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,10 +23,11 @@
stage: tag
script:
- devenv shell tag-version
- only:
- - master
except:
- tags
+ rules:
+ - if: '$CI_COMMIT_MESSAGE =~ /NOT_TAGIT/'
+ when: never
release:
tags:
diff --git a/devenv.nix b/devenv.nix
index 68c6096..cd6131c 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -126,10 +126,11 @@
stage: tag
script:
- devenv shell tag-version
- only:
- - master
except:
- tags
+ rules:
+ - if: '$CI_COMMIT_MESSAGE =~ /NOT_TAGIT/'
+ when: never
release:
tags:
@@ -308,11 +309,11 @@ in {
sed -i "s/version\s*=\s*\".*\"/version=\"''${NEWVERSION}\"/" ${config.devenv.root}/project.nix
${pkgs.git}/bin/git add ${config.devenv.root}/project.nix
- ${pkgs.git}/bin/git commit -m "chore: Bump version to ''${NEWVERSION}"
+ ${pkgs.git}/bin/git commit -m "chore: Bump version to ''${NEWVERSION} (NOT_TAGIT)"
${pkgs.git}/bin/git log --decorate=short --pretty=oneline
- ${pkgs.git}/bin/git tag -a "''${NEWVERSION}" -m "chore: Release ''${NEWVERSION}"
+ ${pkgs.git}/bin/git tag -a "''${NEWVERSION}" -m "chore: Release ''${NEWVERSION} (NOT_TAGIT)"
${pkgs.git}/bin/git push origin $CI_COMMIT_REF_NAME --tags
'';
--
GitLab