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

ci: include mold in x86_64_test-base & rootfs images

Browse Source 
Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24490>
This commit is contained in:
Eric Engestrom
2023-08-03 18:23:50 +01:00
committed by Marge Bot
parent 9359ff9c2d
commit 2c6dc51a90
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci/container/debian/x86_64_test-base.sh
View File

@@ -1,6 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck disable=SC2086 # we want word splitting # shellcheck disable=SC2086 # we want word splitting
# When changing this file, you need to bump the following
# .gitlab-ci/image-tags.yml tags:
# DEBIAN_BASE_TAG
set -e set -e
set -o xtrace set -o xtrace
@@ -35,6 +39,7 @@ STABLE_EPHEMERAL=" \
libepoxy-dev \ libepoxy-dev \
libgbm-dev \ libgbm-dev \
libpciaccess-dev \ libpciaccess-dev \
libssl-dev
libvulkan-dev \ libvulkan-dev \
libwayland-dev \ libwayland-dev \
libx11-xcb-dev \ libx11-xcb-dev \
@@ -123,6 +128,8 @@ pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedeskt
# Needed for manipulation with traces yaml files. # Needed for manipulation with traces yaml files.
pip3 install --break-system-packages yq pip3 install --break-system-packages yq
. .gitlab-ci/container/build-mold.sh
############### Build LLVM-SPIRV translator ############### Build LLVM-SPIRV translator
. .gitlab-ci/container/build-llvm-spirv.sh . .gitlab-ci/container/build-llvm-spirv.sh

3
.gitlab-ci/container/lava_build.sh
View File

@@ -214,6 +214,9 @@ mmdebstrap \
"$ROOTFS/" \ "$ROOTFS/" \
"http://deb.debian.org/debian" "http://deb.debian.org/debian"
############### Install mold
. .gitlab-ci/container/build-mold.sh
############### Setuping ############### Setuping
if [ "$DEBIAN_ARCH" = "amd64" ]; then if [ "$DEBIAN_ARCH" = "amd64" ]; then
. .gitlab-ci/container/setup-wine.sh "/dxvk-wine64" . .gitlab-ci/container/setup-wine.sh "/dxvk-wine64"

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

@@ -1,6 +1,6 @@
variables: variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "2023-07-26-meson-1.2" DEBIAN_BASE_TAG: "2023-08-03-mold"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "2023-06-24-agility-711" DEBIAN_BUILD_TAG: "2023-06-24-agility-711"
@@ -21,7 +21,7 @@ variables:
ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1" ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1"
ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
FEDORA_X86_64_BUILD_TAG: "2023-07-26-meson-1.2" FEDORA_X86_64_BUILD_TAG: "2023-07-26-meson-1.2"
KERNEL_ROOTFS_TAG: "2023-07-24-piglit-ed58dfbd" KERNEL_ROOTFS_TAG: "2023-08-03-mold"
KERNEL_TAG: "v6.3.13-for-mesa-ci-a7f02a9f9591" KERNEL_TAG: "v6.3.13-for-mesa-ci-a7f02a9f9591"
WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_PATH: "windows/x64_vs"