diff options
| author | Eric Anholt <[email protected]> | 2020-06-22 16:54:10 -0700 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-06-25 17:33:28 +0000 |
| commit | 9079b53987e3d8dd82b0fa40a010f32524b13aeb (patch) | |
| tree | 6aa9a4090ec5975f3c0c28a234f918fa656e0a1e /.gitlab-ci/bare-metal | |
| parent | 21b2dac793081fc7072f7ddfd0ba2f4aa94e8a0a (diff) | |
ci/bare-metal: Skip setting of unset variables at startup.
It's silly to be setting (and logging the setting of!) all the env vars we
*didn't* set in a job.
Reviewed-by: Tomeu Vizoso <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5433>
Diffstat (limited to '.gitlab-ci/bare-metal')
| -rw-r--r-- | .gitlab-ci/bare-metal/rootfs-setup.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh index ba4cdf45bba..ff86054c4e6 100644 --- a/.gitlab-ci/bare-metal/rootfs-setup.sh +++ b/.gitlab-ci/bare-metal/rootfs-setup.sh @@ -39,7 +39,9 @@ for var in \ VK_DRIVER \ ; do val=`echo ${!var} | sed 's|"||g'` - echo "export $var=\"${val}\"" >> $rootfs_dst/set-job-env-vars.sh + if [ -n "$val" ]; then + echo "export $var=\"${val}\"" >> $rootfs_dst/set-job-env-vars.sh + fi done echo "Variables passed through:" cat $rootfs_dst/set-job-env-vars.sh |