Skip to content
Snippets Groups Projects
Verified Commit 20ced68d authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

fix: wip new pipeline

parent e3793e54
No related branches found
No related tags found
No related merge requests found
......@@ -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
......@@ -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"
'';
};
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment