From 7469022142218ebaa830b160b2f26cdb5d4b88c2 Mon Sep 17 00:00:00 2001
From: Sebastian Wendel <s.wendel@fabcity.hamburg>
Date: Tue, 12 Jul 2022 19:02:36 +0200
Subject: [PATCH] fixed pipeline

---
 .editorconfig  | 4 ++++
 .envrc         | 4 ++++
 .gitlab-ci.yml | 2 ++
 shell.nix      | 7 +++----
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index a65d818..60160ca 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,10 @@ max_line_length = 120
 indent_size = 2
 indent_style = space
 
+[*.{nix}]
+indent_size = 2
+indent_style = space
+
 [*.md]
 indent_size = 2
 indent_style = space
diff --git a/.envrc b/.envrc
index 364b4b0..ff5d1e6 100644
--- a/.envrc
+++ b/.envrc
@@ -1,3 +1,7 @@
+if ! has nix_direnv_version || ! nix_direnv_version 2.1.1; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.1.1/direnvrc" "sha256-b6qJ4r34rbE23yWjMqbmu3ia2z4b2wIlZUksBke/ol0="
+fi
+
 watch_file **/*.nix
 watch_file flake.lock
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd37b74..d0745fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ default:
   image: nixpkgs/nix-unstable:${NIX_VERSION}
   timeout: 1 hours
   before_script:
+    - pwd
+    - ls -lah
     - nix profile install --inputs-from . 'nixpkgs#direnv'
     - direnv hook bash >> ~/.bashrc
     - source ~/.bashrc
diff --git a/shell.nix b/shell.nix
index 75f13fd..8b1abd2 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,6 +5,9 @@ with pkgs;
 mkShell {
   name = "fcos.integration";
   nativeBuildInputs = with pkgs; [
+    bashInteractive
+  ];
+  buildInputs = with pkgs; [
     editorconfig-checker
     git
     hadolint
@@ -35,8 +38,4 @@ mkShell {
     . <(kubectl completion $(basename $SHELL))
     . <(kustomize completion $(basename $SHELL))
   '';
-
-  shellHook = ''
-    echo "Welcome to ${projectName}"
-  '';
 }