From 63176804c9fbff1e81f828f72e8153849716f29c Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sun, 12 May 2024 23:45:33 +0200
Subject: [PATCH] fix: wip new pipeline
---
.gitlab-ci.yml | 12 ++++++------
flake.nix | 3 +--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acefaff1c..455e8e7b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,12 +9,12 @@ stages:
- test
- deploy
-before_script:
- - git config --global user.email "${GITLAB_USER_EMAIL}"
- - git config --global user.name "${GITLAB_USER_NAME}"
- - git config --global credential.helper '!f() { echo "username=gitlab-ci-token"; echo "password=${CI_JOB_TOKEN}"; }; f'
- - git config --global pull.rebase true
- - git config --global http.sslVerify "false"
+#before_script:
+# - git config --global user.email "${GITLAB_USER_EMAIL}"
+# - git config --global user.name "${GITLAB_USER_NAME}"
+# - git config --global credential.helper '!f() { echo "username=gitlab-ci-token"; echo "password=${CI_JOB_TOKEN}"; }; f'
+# - git config --global pull.rebase true
+# - git config --global http.sslVerify "false"
after_script:
- if [ -f .env-gitlab-ci ]; then rm .env-gitlab-ci; fi
diff --git a/flake.nix b/flake.nix
index d5e2d8d23..c0f3e6cc7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,8 +49,7 @@
];
gitlabPackages =
- commonPackages
- ++ [
+ [
script-run-ci-tests
];
--
GitLab