From b2c61a3347005755cfc291ebe34e3cf885e316bd Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Tue, 28 Dec 2021 01:35:49 +0100
Subject: [PATCH] Remove unnecessary shell evocations and add debug output
Also magically fixes Gitlab CI issues
---
.gitlab-ci.yml | 4 ++--
examples/build_incremental/execute_example.sh | 1 +
examples/build_incremental_nix_legacy/execute_example.sh | 1 +
examples/nix_builder/execute_example.sh | 2 ++
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1970908..7dfde7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
build_incremental:
stage: build
image: nixpkgs/nix-flakes
- script: nix shell nixpkgs#zsh --command zsh -c './examples/build_incremental/execute_example.sh'
+ script: pwd; nix shell nixpkgs#zsh --command ./examples/build_incremental/execute_example.sh
tags:
- docker
- kubernetes
@@ -12,7 +12,7 @@ build_incremental:
build_incremental_nix_legacy:
stage: build
image: nixpkgs/nix
- script: NIX_PATH=nixpkgs=channel:nixos-unstable nix-shell -p zsh --run 'zsh -c ./examples/build_incremental_nix_legacy/execute_example.sh'
+ script: pwd; NIX_PATH=nixpkgs=channel:nixos-unstable nix-shell -p zsh --run ./examples/build_incremental_nix_legacy/execute_example.sh
tags:
- docker
- kubernetes
diff --git a/examples/build_incremental/execute_example.sh b/examples/build_incremental/execute_example.sh
index 3628838..8b090ad 100755
--- a/examples/build_incremental/execute_example.sh
+++ b/examples/build_incremental/execute_example.sh
@@ -1,5 +1,6 @@
#!/bin/sh
+set -x
# Set the current device and environments
./bin/set-device examples/build_incremental/device
diff --git a/examples/build_incremental_nix_legacy/execute_example.sh b/examples/build_incremental_nix_legacy/execute_example.sh
index ba379c9..770c4f0 100755
--- a/examples/build_incremental_nix_legacy/execute_example.sh
+++ b/examples/build_incremental_nix_legacy/execute_example.sh
@@ -1,5 +1,6 @@
#!/bin/sh
+set -x
# Set the current device and environments
./bin/set-device examples/build_incremental/device
diff --git a/examples/nix_builder/execute_example.sh b/examples/nix_builder/execute_example.sh
index 5084b27..650da90 100755
--- a/examples/nix_builder/execute_example.sh
+++ b/examples/nix_builder/execute_example.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+set -x
+
cd examples/nix_builder
--
GitLab