Module: Mesa Branch: main Commit: 07a8fdb9bb5889941afdcb7a589c7b1d80d32be7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=07a8fdb9bb5889941afdcb7a589c7b1d80d32be7
Author: Eric Engestrom <[email protected]> Date: Tue May 9 18:49:16 2023 +0100 ci: stop marking environment variable list as executable We're only going to read it, not execute it. Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Emma Anholt <[email protected]> Reviewed-by: Martin Roukala <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22945> --- .gitlab-ci.yml | 1 - .gitlab-ci/bare-metal/rootfs-setup.sh | 1 - .gitlab-ci/test/gitlab-ci.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a72fc18393..3c6d90df257 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,6 @@ default: - > export SCRIPTS_DIR=$(mktemp -d) && curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 -O --output-dir "${SCRIPTS_DIR}" "${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/setup-test-env.sh" && - chmod +x ${SCRIPTS_DIR}/setup-test-env.sh && . ${SCRIPTS_DIR}/setup-test-env.sh && echo -n "${CI_JOB_JWT}" > "${CI_JOB_JWT_FILE}" && unset CI_JOB_JWT # Unsetting vulnerable env variables diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh index 7d0c9b4aac6..6bd5adb39ca 100644 --- a/.gitlab-ci/bare-metal/rootfs-setup.sh +++ b/.gitlab-ci/bare-metal/rootfs-setup.sh @@ -24,7 +24,6 @@ set +x # Pass through relevant env vars from the gitlab job to the baremetal init script "$CI_COMMON"/generate-env.sh > $rootfs_dst/set-job-env-vars.sh -chmod +x $rootfs_dst/set-job-env-vars.sh echo "Variables passed through:" cat $rootfs_dst/set-job-env-vars.sh diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 30565f72343..75fe5a51975 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -335,7 +335,6 @@ clang-format: set +x "$CI_COMMON_SCRIPTS"/generate-env.sh > ${JOB_FOLDER}/set-job-env-vars.sh echo "export SCRIPTS_DIR=./install" >> ${JOB_FOLDER}/set-job-env-vars.sh - chmod +x ${JOB_FOLDER}/set-job-env-vars.sh echo "Variables passed through:" cat ${JOB_FOLDER}/set-job-env-vars.sh echo "export CI_JOB_JWT=${CI_JOB_JWT}" >> ${JOB_FOLDER}/set-job-env-vars.sh
