From 417829c3261fdc7ada068b3d98b3a2335cb6107f Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Wed, 19 Jun 2024 21:02:05 +0200
Subject: [PATCH] fix: wip new pipeline
---
.gitlab-ci.yml | 64 ++++++++++++++++++++---------------------
nix/scripts/release.nix | 4 +--
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0191dc37..591486556 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,38 +20,38 @@ before_script:
after_script:
- nix develop .#gitlab --command clean-up
-tests:
- stage: test
- tags:
- - nixos-gen3
- script:
- - nix develop .#gitlab --command run-ci-tests
- cache:
- untracked: true
- key:
- files:
- - pnpm-lock.yaml
- paths:
- - node_modules/
-
-web-tests:
- stage: test
- tags:
- - nixos-gen3
- script:
- - nix develop .#gitlab --command run-ci-web-tests
- cache:
- untracked: true
- key:
- files:
- - pnpm-lock.yaml
- paths:
- - node_modules/
- artifacts:
- paths:
- - screenshot.png
- rules:
- - if: '$CI_COMMIT_TAG == null'
+#tests:
+# stage: test
+# tags:
+# - nixos-gen3
+# script:
+# - nix develop .#gitlab --command run-ci-tests
+# cache:
+# untracked: true
+# key:
+# files:
+# - pnpm-lock.yaml
+# paths:
+# - node_modules/
+#
+#web-tests:
+# stage: test
+# tags:
+# - nixos-gen3
+# script:
+# - nix develop .#gitlab --command run-ci-web-tests
+# cache:
+# untracked: true
+# key:
+# files:
+# - pnpm-lock.yaml
+# paths:
+# - node_modules/
+# artifacts:
+# paths:
+# - screenshot.png
+# rules:
+# - if: '$CI_COMMIT_TAG == null'
release:
stage: release
diff --git a/nix/scripts/release.nix b/nix/scripts/release.nix
index 07bc2b4d8..93fd9fb37 100644
--- a/nix/scripts/release.nix
+++ b/nix/scripts/release.nix
@@ -34,7 +34,7 @@ in
${pkgs'.git}/bin/git checkout $CI_COMMIT_REF_NAME
${pkgs'.git}/bin/git pull origin $CI_COMMIT_REF_NAME
- if ! ${pkgs'.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 30
+ if ! ${pkgs'.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 10
then
echo_fail "Error: Could not get git log."
exit 1
@@ -51,7 +51,7 @@ in
fi
echo_step "Write project version"
-
+set -x
export VERSION=$gitVersion
export COMMIT="$CI_COMMIT_SHA"
export NAME=$(basename $(pwd) | sed 's/./\U&/' | sed 's/-//g')
--
GitLab