From 0533a13080c629cdaaf96f313689ff834e859bab Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sun, 12 May 2024 17:01:37 +0200
Subject: [PATCH] fix: wip new pipeline
---
.gitlab-ci.yml | 2 ++
flake.nix | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3aa4f9e4..48982b83b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@ test:
stage: test
tags:
- nixos
+ - gen3
script:
- nix develop --command run-ci-tests
@@ -25,6 +26,7 @@ deploy:
stage: deploy
tags:
- nixos
+ - gen3
script:
- nix develop --command deploy
after_script:
diff --git a/flake.nix b/flake.nix
index f63b3046d..e8953e3de 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,12 +56,12 @@
shellPackages = let
lib = pkgs'.lib;
- ciJobToken = builtins.getEnv "CI_JOB_TOKEN";
+ gitlabToken = builtins.getEnv "GITLAB_TOKEN";
in
commonPackages
++ extendedPackages
++ scriptPackages
- ++ lib.optionals (ciJobToken != null) ciScriptPackages;
+ ++ lib.optionals (gitlabToken!="") ciScriptPackages;
debugShellPackages =
commonPackages
--
GitLab