From 20ced68d7fbf80505eed14dd37706f779960143a Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sun, 12 May 2024 19:28:54 +0200
Subject: [PATCH] fix: wip new pipeline
---
.gitlab-ci.yml | 3 ++-
flake.nix | 36 ++++++++++++++++++++++--------------
2 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 401e06ead..6fa7ce003 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ test:
tags:
- nixos-gen3
script:
- - nix develop --command run-ci-tests
+ - nix develop .#gitlab --command run-ci-tests
deploy:
stage: deploy
@@ -29,3 +29,4 @@ deploy:
- nix develop --command clean-up
when: on_success
+
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index e8953e3de..73f4c89b8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,34 +48,34 @@
versionPath
];
- ciScriptPackages = [
+ gitlabPackages =
+ commonPackages
+ ++ scriptPackages
+ ++ [
+
script-deploy
script-clean-up
script-run-ci-tests
- ];
+ ];
+
shellPackages = let
lib = pkgs'.lib;
- gitlabToken = builtins.getEnv "GITLAB_TOKEN";
in
commonPackages
++ extendedPackages
- ++ scriptPackages
- ++ lib.optionals (gitlabToken!="") ciScriptPackages;
+ ++ scriptPackages;
- debugShellPackages =
- commonPackages
- ++ scriptPackages
- ++ [
- ];
+
in {
packages = rec {
monster = pkgs'.callPackage ./nix/packages/monster.nix {inherit commonScript;};
- default = self.monster;
+ default = monster;
};
devShells = {
+
default = let
ciJobToken = builtins.getEnv "CI_JOB_TOKEN";
in
@@ -114,11 +114,11 @@
'';
};
- debug = let
+ gitlab = let
ciJobToken = builtins.getEnv "CI_JOB_TOKEN";
in
pkgs'.mkShell {
- nativeBuildInputs = debugShellPackages;
+ nativeBuildInputs = gitlabPackages;
# apps.run-server = pkgs'.writeShellScriptBin "run-server" ''
# ${commonScript}
@@ -126,7 +126,15 @@
# '';
shellHook = ''
-
+ source ${commonScript}
+
+ if [ -z "${ciJobToken}" ]; then
+ echo_fail "You are not in a CI environment, this shell is intended for CI, but for local development"
+ exit 1
+ fi
+
+ echo_header "Gitlab Monster Shell"
+
'';
};
};
--
GitLab