OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: use bash arrays in Fedora script + shebang change

Browse Source 
We not passing very long string, but multiple separate packages, using
the array seems to be more logical and clear solution, without
shellcheck complaining about word spliting and risk making of accidental
mistakes (missed backslash etc.).

Shebang change, because let's have it same everywhere.

Reviewed-by: Eric Engestrom <eric@igalia.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23425>
This commit is contained in:
David Heidelberg
2023-06-01 11:35:00 +02:00
parent bfb092b955
commit bcc0947ed0
2 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
.gitlab-ci/container/fedora/x86_64_build.sh
View File

@@ -1,77 +1,78 @@
#!/bin/bash
# shellcheck disable=SC2086 # we want word splitting
#!/usr/bin/env bash
# shellcheck disable=SC1091
set -e
set -o xtrace
EPHEMERAL="
EPHEMERAL=(
autoconf
automake
bzip2
cmake
git
libtool
pkgconfig(epoxy)
pkgconfig(gbm)
pkgconfig(openssl)
"pkgconfig(epoxy)"
"pkgconfig(gbm)"
"pkgconfig(openssl)"
unzip
xz
"
)
dnf install -y --setopt=install_weak_deps=False \
bindgen \
bison \
clang-devel \
flex \
gcc \
gcc-c++ \
gettext \
glslang \
kernel-headers \
llvm-devel \
meson \
"pkgconfig(LLVMSPIRVLib)" \
"pkgconfig(SPIRV-Tools)" \
"pkgconfig(dri2proto)" \
"pkgconfig(expat)" \
"pkgconfig(glproto)" \
"pkgconfig(libclc)" \
"pkgconfig(libelf)" \
"pkgconfig(libglvnd)" \
"pkgconfig(libomxil-bellagio)" \
"pkgconfig(libselinux)" \
"pkgconfig(libva)" \
"pkgconfig(pciaccess)" \
"pkgconfig(vdpau)" \
"pkgconfig(vulkan)" \
"pkgconfig(x11)" \
"pkgconfig(x11-xcb)" \
"pkgconfig(xcb)" \
"pkgconfig(xcb-dri2)" \
"pkgconfig(xcb-dri3)" \
"pkgconfig(xcb-glx)" \
"pkgconfig(xcb-present)" \
"pkgconfig(xcb-randr)" \
"pkgconfig(xcb-sync)" \
"pkgconfig(xcb-xfixes)" \
"pkgconfig(xdamage)" \
"pkgconfig(xext)" \
"pkgconfig(xfixes)" \
"pkgconfig(xrandr)" \
"pkgconfig(xshmfence)" \
"pkgconfig(xxf86vm)" \
"pkgconfig(zlib)" \
procps-ng \
python-unversioned-command \
python3-devel \
python3-mako \
python3-ply \
rust-packaging \
vulkan-headers \
spirv-tools-devel \
spirv-llvm-translator-devel \
$EPHEMERAL
DEPS=(
bindgen
bison
clang-devel
flex
gcc
gcc-c++
gettext
glslang
kernel-headers
llvm-devel
meson
"pkgconfig(LLVMSPIRVLib)"
"pkgconfig(SPIRV-Tools)"
"pkgconfig(dri2proto)"
"pkgconfig(expat)"
"pkgconfig(glproto)"
"pkgconfig(libclc)"
"pkgconfig(libelf)"
"pkgconfig(libglvnd)"
"pkgconfig(libomxil-bellagio)"
"pkgconfig(libselinux)"
"pkgconfig(libva)"
"pkgconfig(pciaccess)"
"pkgconfig(vdpau)"
"pkgconfig(vulkan)"
"pkgconfig(x11)"
"pkgconfig(x11-xcb)"
"pkgconfig(xcb)"
"pkgconfig(xcb-dri2)"
"pkgconfig(xcb-dri3)"
"pkgconfig(xcb-glx)"
"pkgconfig(xcb-present)"
"pkgconfig(xcb-randr)"
"pkgconfig(xcb-sync)"
"pkgconfig(xcb-xfixes)"
"pkgconfig(xdamage)"
"pkgconfig(xext)"
"pkgconfig(xfixes)"
"pkgconfig(xrandr)"
"pkgconfig(xshmfence)"
"pkgconfig(xxf86vm)"
"pkgconfig(zlib)"
procps-ng
python-unversioned-command
python3-devel
python3-mako
python3-ply
rust-packaging
vulkan-headers
spirv-tools-devel
spirv-llvm-translator-devel
)
dnf install -y --setopt=install_weak_deps=False "${DEPS[@]}" "${EPHEMERAL[@]}"
. .gitlab-ci/container/container_pre_build.sh
@@ -104,6 +105,6 @@ popd
############### Uninstall the build software
dnf remove -y $EPHEMERAL
dnf remove -y "${EPHEMERAL[@]}"
. .gitlab-ci/container/container_post_build.sh

2
.gitlab-ci/image-tags.yml
View File

@@ -20,7 +20,7 @@ variables:
DEBIAN_X86_64_TEST_VK_TAG: "2023-05-25-vkd3d-proton"
ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1"
FEDORA_X86_64_BUILD_TAG: "2023-04-26-rusticl"
FEDORA_X86_64_BUILD_TAG: "2023-05-05-ccache-on"
KERNEL_ROOTFS_TAG: "2023-05-31-vvl"
WINDOWS_X64_VS_PATH: "windows/x64_vs"