Skip to content
Snippets Groups Projects
Verified Commit 7f446555 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

fix: test ci pipeline

parent ca971c11
No related branches found
No related tags found
No related merge requests found
...@@ -171,11 +171,11 @@ ...@@ -171,11 +171,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1700695799, "lastModified": 1704188267,
"narHash": "sha256-nXRhRE69kULaNxijX7ZF14pGSu6Ar/FIvfKCIut7OXc=", "narHash": "sha256-9Wrl8w8jQxhz8uuuojZX5a6EPqqlNY6/HzKa1RuKNfc=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "fdcc60bfd3642207e50e8e6c89c0a9a7b27a40a9", "rev": "ca971c11a1600679e981f28c5433581355033b9b",
"revCount": 41, "revCount": 42,
"type": "git", "type": "git",
"url": "https://gitlab.schukai.com/oss/utilities/version.git" "url": "https://gitlab.schukai.com/oss/utilities/version.git"
}, },
......
...@@ -177,14 +177,14 @@ PATH="''${PATH}":${pkgs.git}/bin/ ...@@ -177,14 +177,14 @@ PATH="''${PATH}":${pkgs.git}/bin/
PATH="''${PATH}":${pkgs.gnugrep}/bin/ PATH="''${PATH}":${pkgs.gnugrep}/bin/
PATH="''${PATH}":${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/ PATH="''${PATH}":${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/
export -f PATH export PATH
if [ -z "'CI_JOB_TOKEN" ]; then if [ -z "'CI_JOB_TOKEN" ]; then
version=''$(git describe --tags --always --dirty) version=''$(git describe --tags --always --dirty)
buildDate=''$(date -u +"%Y-%m-%dT%H:%M:%SZ") buildDate=''$(date -u +"%Y-%m-%dT%H:%M:%SZ")
else else
version=''$(version predict) version=''$(version predict --git)
buildDate=''$(version date) buildDate=''$(version date)
fi fi
...@@ -267,7 +267,7 @@ fi ...@@ -267,7 +267,7 @@ fi
git --no-pager log --decorate=short --pretty=oneline git --no-pager log --decorate=short --pretty=oneline
## the version should be the same as in the build task ## 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 then
echo "ERROR: Could not update version." echo "ERROR: Could not update version."
exit 1 exit 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment