@@ -6,3 +6,5 @@ else
env >&2
exit 1
fi
+
+echo "CONFIG: CI_TYPE=$CI_TYPE" >&2
@@ -1,5 +1,5 @@
#!/bin/sh
-set -ex
+set -e
# Helper libraries
. ${0%/*}/lib-ci-type.sh
@@ -11,12 +11,16 @@ then
echo "need a $0 mode, e.g. --build or --test"
exit 1
fi
+echo "CONFIG: mode=$mode" >&2
if test -z "$jobname"
then
echo "must set a CI jobname" >&2
exit 1
fi
+echo "CONFIG: jobname=$jobname" >&2
+echo "CONFIG: runs_on_pool=$runs_on_pool" >&2
+echo "CONFIG: GITHUB_ENV=$GITHUB_ENV" >&2
# Helper functions
setenv () {
@@ -39,6 +43,7 @@ setenv () {
if test -n "$skip"
then
+ echo "SKIP '$key=$val'" >&2
return 0
fi
@@ -50,6 +55,8 @@ setenv () {
# itself.
eval "export $key=\"$val\""
fi
+
+ echo "SET: '$key=$val'" >&2
}
# Clear variables that may come from the outside world.
Remove the "set -x" from the "ci/lib.sh" output. Before preceding commits the logic in that file was much more complex, and likely to fail in some scenarios. Now we only task "ci/lib.sh" with setting various variables for subsequent steps in our jobs, so we can start emitting more tailored debugging output, which makes what it's doing easier to read. This change also changes the output of the "ci/print-test-failures.sh" script, since it's the only other user of "ci/lib-ci-type.sh". In that case it's also helpful to know what "$CI_TYPE" we're using, as that script doesn't "set -x" and will act differently depending on the $CI_TYPE. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- ci/lib-ci-type.sh | 2 ++ ci/lib.sh | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-)