From d365433d4f3320b53379fa486b2fccd7a889331b Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sun, 12 May 2024 23:00:52 +0200
Subject: [PATCH] fix: wip new pipeline
---
.gitlab-ci.yml | 7 +++++++
flake.nix | 26 +++++++++++++-------------
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fa7ce003..acefaff1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,13 @@ 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"
+
after_script:
- if [ -f .env-gitlab-ci ]; then rm .env-gitlab-ci; fi
diff --git a/flake.nix b/flake.nix
index 4f9e376f5..d5e2d8d23 100644
--- a/flake.nix
+++ b/flake.nix
@@ -120,19 +120,19 @@
cd ''${CI_PROJECT_DIR} || exit 1
- ${pkgs'.git}/bin/git config --global user.email "''${GITLAB_USER_EMAIL}"
- ${pkgs'.git}/bin/git config --global user.name "''${GITLAB_USER_NAME}"
- ${pkgs'.git}/bin/git config --global credential.helper '!f() { echo "username=gitlab-ci-token"; echo "password=''${CI_JOB_TOKEN}"; }; f'
- ${pkgs'.git}/bin/git config --global pull.rebase true
- ${pkgs'.git}/bin/git config --global http.sslVerify "false"
-
- ${pkgs'.git}/bin/git remote set-url origin "''${CI_REPOSITORY_URL}"
-
- ${pkgs'.git}/bin/git fetch --all --tags --unshallow
- ${pkgs'.git}/bin/git reset --hard origin/master
- ${pkgs'.git}/bin/git clean -fd
- ${pkgs'.git}/bin/git checkout $CI_COMMIT_REF_NAME
- ${pkgs'.git}/bin/git pull origin $CI_COMMIT_REF_NAME
+# ${pkgs'.git}/bin/git config --global user.email "''${GITLAB_USER_EMAIL}"
+# ${pkgs'.git}/bin/git config --global user.name "''${GITLAB_USER_NAME}"
+# ${pkgs'.git}/bin/git config --global credential.helper '!f() { echo "username=gitlab-ci-token"; echo "password=''${CI_JOB_TOKEN}"; }; f'
+# ${pkgs'.git}/bin/git config --global pull.rebase true
+# ${pkgs'.git}/bin/git config --global http.sslVerify "false"
+#
+# ${pkgs'.git}/bin/git remote set-url origin "''${CI_REPOSITORY_URL}"
+#
+# ${pkgs'.git}/bin/git fetch --all --tags --unshallow
+# ${pkgs'.git}/bin/git reset --hard origin/master
+# ${pkgs'.git}/bin/git clean -fd
+# ${pkgs'.git}/bin/git checkout $CI_COMMIT_REF_NAME
+# ${pkgs'.git}/bin/git pull origin $CI_COMMIT_REF_NAME
--
GitLab