From 7efff3740b24450abf6b658ba6fb8aeb0d82b05b Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Mon, 23 Oct 2023 01:34:29 +0200
Subject: [PATCH] fix: ci pipeline

---
 .gitlab-ci.yml | 3 +--
 devenv.nix     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56b88ff..95a4c11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,8 +32,7 @@ before_script:
   - variables=("HOME=$HOME" "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" "CI_REPOSITORY_URL=$CI_REPOSITORY_URL" "GITLAB_TOKEN=$GITLAB_TOKEN" "CI_JOB_TOKEN=$CI_JOB_TOKEN" "GITLAB_USER_EMAIL=$GITLAB_USER_EMAIL" "GITLAB_USER_NAME=\"$GITLAB_USER_NAME\"" "CI_REGISTRY_USER=$CI_REGISTRY_USER" "CI_PROJECT_ID=$CI_PROJECT_ID" "CI_PROJECT_DIR=$CI_PROJECT_DIR" "CI_API_V4_URL=$CI_API_V4_URL" "CI_PROJECT_NAME=$CI_PROJECT_NAME" "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA"); for var in "${variables[@]}"; do echo "$var" >> .env-gitlab-ci; done
   - cat .env-gitlab-ci
   - env
-  - export DOCKER_HOST="unix:///var/run/docker.sock"
-  - nix shell nixpkgs#docker-client -c docker info
+  - export DOCKER_HOST="unix:///var/run/docker.sock" && nix shell nixpkgs#docker-client -c docker info
 
 after_script:
   - if [ -f .env-gitlab-ci ]; then rm .env-gitlab-ci; fi
diff --git a/devenv.nix b/devenv.nix
index fe987c7..90e1359 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -331,8 +331,7 @@ EOF
       - variables=("HOME=$HOME" "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" "CI_REPOSITORY_URL=$CI_REPOSITORY_URL" "GITLAB_TOKEN=$GITLAB_TOKEN" "CI_JOB_TOKEN=$CI_JOB_TOKEN" "GITLAB_USER_EMAIL=$GITLAB_USER_EMAIL" "GITLAB_USER_NAME=\"$GITLAB_USER_NAME\"" "CI_REGISTRY_USER=$CI_REGISTRY_USER" "CI_PROJECT_ID=$CI_PROJECT_ID" "CI_PROJECT_DIR=$CI_PROJECT_DIR" "CI_API_V4_URL=$CI_API_V4_URL" "CI_PROJECT_NAME=$CI_PROJECT_NAME" "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA"); for var in "''${variables[@]}"; do echo "$var" >> .env-gitlab-ci; done
       - cat .env-gitlab-ci
       - env
-      - export DOCKER_HOST="unix:///var/run/docker.sock"
-      - nix shell nixpkgs#docker-client -c docker info
+      - export DOCKER_HOST="unix:///var/run/docker.sock" && nix shell nixpkgs#docker-client -c docker info
 
     after_script:
       - if [ -f .env-gitlab-ci ]; then rm .env-gitlab-ci; fi
-- 
GitLab