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

fix: wip new pipeline

parent ff1da792
No related branches found
No related tags found
No related merge requests found
...@@ -48,16 +48,14 @@ ...@@ -48,16 +48,14 @@
versionPath versionPath
]; ];
gitlabPackages = gitlabPackages =
commonPackages commonPackages
++ scriptPackages ++ scriptPackages
++ [ ++ [
script-deploy
script-deploy script-clean-up
script-clean-up script-run-ci-tests
script-run-ci-tests
]; ];
shellPackages = let shellPackages = let
lib = pkgs'.lib; lib = pkgs'.lib;
...@@ -65,8 +63,6 @@ ...@@ -65,8 +63,6 @@
commonPackages commonPackages
++ extendedPackages ++ extendedPackages
++ scriptPackages; ++ scriptPackages;
in { in {
packages = rec { packages = rec {
monster = pkgs'.callPackage ./nix/packages/monster.nix {inherit commonScript;}; monster = pkgs'.callPackage ./nix/packages/monster.nix {inherit commonScript;};
...@@ -75,7 +71,6 @@ ...@@ -75,7 +71,6 @@
}; };
devShells = { devShells = {
default = let default = let
ciJobToken = builtins.getEnv "CI_JOB_TOKEN"; ciJobToken = builtins.getEnv "CI_JOB_TOKEN";
in in
...@@ -120,54 +115,53 @@ ...@@ -120,54 +115,53 @@
pkgs'.mkShell { pkgs'.mkShell {
#nativeBuildInputs = gitlabPackages; #nativeBuildInputs = gitlabPackages;
shellHook = '' shellHook = ''
set -x set -x
${pkgs'.coreutils}/bin/printenv ${pkgs'.coreutils}/bin/printenv
if [ -z "$GITLAB_TOKEN" ]; then if [ -z "''${GITLAB_TOKEN}" ]; then
exit 1 # exit 1
fi fi
if [ -z "''${CI_REPOSITORY_URL}" ]; then if [ -z "''${CI_REPOSITORY_URL}" ]; then
exit 1 # exit 1
fi fi
if [ -z "''${CI_PROJECT_DIR}" ]; then if [ -z "''${CI_PROJECT_DIR}" ]; then
exit 1 # exit 1
fi fi
cd ''${CI_PROJECT_DIR} || exit 1 cd ''${CI_PROJECT_DIR} || exit 1
${pkgs'.git}/bin/git config --global user.email "''${GITLAB_USER_EMAIL}" ${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 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 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 pull.rebase true
${pkgs'.git}/bin/git config --global http.sslVerify "false" ${pkgs'.git}/bin/git config --global http.sslVerify "false"
${pkgs'.git}/bin/git remote set-url origin https://pad:''${GITLAB_TOKEN}@''${CI_REPOSITORY_URL#*@} ${pkgs'.git}/bin/git remote set-url origin https://pad:''${GITLAB_TOKEN}@''${CI_REPOSITORY_URL#*@}
${pkgs'.git}/bin/git fetch --all --tags --unshallow ${pkgs'.git}/bin/git fetch --all --tags --unshallow
${pkgs'.git}/bin/git reset --hard origin/master ${pkgs'.git}/bin/git reset --hard origin/master
${pkgs'.git}/bin/git clean -fd ${pkgs'.git}/bin/git clean -fd
${pkgs'.git}/bin/git checkout $CI_COMMIT_REF_NAME ${pkgs'.git}/bin/git checkout $CI_COMMIT_REF_NAME
${pkgs'.git}/bin/git pull origin $CI_COMMIT_REF_NAME ${pkgs'.git}/bin/git pull origin $CI_COMMIT_REF_NAME
if ! ${pkgs'.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 30 if ! ${pkgs'.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 30
then then
exit 1 exit 1
fi fi
${pkgs'.git}/bin/git fetch --prune --prune-tags ${pkgs'.git}/bin/git fetch --prune --prune-tags
echo "YES!!!!" echo "YES!!!!"
''; '';
}; };
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment