From 7f446555ba7c69edbf7a8e3f26c3ada18d7d3f9f Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Tue, 2 Jan 2024 10:46:25 +0100
Subject: [PATCH] fix: test ci pipeline
---
devenv.lock | 8 ++++----
devenv.nix | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/devenv.lock b/devenv.lock
index a315bfe..d6bb922 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -171,11 +171,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1700695799,
- "narHash": "sha256-nXRhRE69kULaNxijX7ZF14pGSu6Ar/FIvfKCIut7OXc=",
+ "lastModified": 1704188267,
+ "narHash": "sha256-9Wrl8w8jQxhz8uuuojZX5a6EPqqlNY6/HzKa1RuKNfc=",
"ref": "refs/heads/master",
- "rev": "fdcc60bfd3642207e50e8e6c89c0a9a7b27a40a9",
- "revCount": 41,
+ "rev": "ca971c11a1600679e981f28c5433581355033b9b",
+ "revCount": 42,
"type": "git",
"url": "https://gitlab.schukai.com/oss/utilities/version.git"
},
diff --git a/devenv.nix b/devenv.nix
index 304e259..6b5bef8 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -177,14 +177,14 @@ PATH="''${PATH}":${pkgs.git}/bin/
PATH="''${PATH}":${pkgs.gnugrep}/bin/
PATH="''${PATH}":${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/
-export -f PATH
+export PATH
if [ -z "'CI_JOB_TOKEN" ]; then
version=''$(git describe --tags --always --dirty)
buildDate=''$(date -u +"%Y-%m-%dT%H:%M:%SZ")
else
- version=''$(version predict)
+ version=''$(version predict --git)
buildDate=''$(version date)
fi
@@ -267,7 +267,7 @@ fi
git --no-pager log --decorate=short --pretty=oneline
## the version should be the same as in the build task
-if ! version auto --git --verbose
+if ! version auto --git --verbose --exit-code-if-no-bump
then
echo "ERROR: Could not update version."
exit 1
--
GitLab