Module: Mesa Branch: main Commit: 4ada7f0239c2bac6dca60871ee2c66044410b6f7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ada7f0239c2bac6dca60871ee2c66044410b6f7
Author: David Heidelberg <[email protected]> Date: Sat Nov 26 21:29:38 2022 +0100 ci: CI should handle also arrays in meson cross-file The new meson env2mfile generates everything in the arrays. Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19863> --- .gitlab-ci/container/create-cross-file.sh | 5 +++-- .gitlab-ci/prepare-artifacts.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/create-cross-file.sh b/.gitlab-ci/container/create-cross-file.sh index dddb9a2ef31..abfe72f445f 100755 --- a/.gitlab-ci/container/create-cross-file.sh +++ b/.gitlab-ci/container/create-cross-file.sh @@ -13,8 +13,9 @@ fi # shellcheck disable=SC1003 # how this sed doesn't seems to work for me locally sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file" -# Add a line for rustc, which debcrossgen is missing. -cc=$(sed -n 's|c = .\(.*\).|\1|p' < "$cross_file") +# Add a line for rustc, which meson env2mfile is missing. +cc=$(sed -n "s|^c\s*=\s*\[?'\(.*\)'\]?|\1|p" < "$cross_file") + if [[ "$arch" = "arm64" ]]; then rust_target=aarch64-unknown-linux-gnu elif [[ "$arch" = "armhf" ]]; then diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh index bd098d5f7be..1f243566a99 100755 --- a/.gitlab-ci/prepare-artifacts.sh +++ b/.gitlab-ci/prepare-artifacts.sh @@ -10,7 +10,7 @@ rm -rf install/bin install/include # Strip the drivers in the artifacts to cut 80% of the artifacts size. if [ -n "$CROSS" ]; then - STRIP=`sed -n -E "s/strip\s*=\s*'(.*)'/\1/p" "$CROSS_FILE"` + STRIP=$(sed -n -E "s/strip\s*=\s*\[?'(.*)'\]?/\1/p" "$CROSS_FILE") if [ -z "$STRIP" ]; then echo "Failed to find strip command in cross file" exit 1
