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

ci: Only apply patches with the build-skqp prefix

Browse Source 
Allows to ship patches for other components too.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15772>
This commit is contained in:
Corentin Noël
2022-04-06 15:57:40 +02:00
committed by Marge Bot
parent 8db9b175a5
commit 9a88231458
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/container/build-skqp.sh
View File

@@ -64,7 +64,7 @@ download_skia_source
pushd "${SKIA_DIR}" pushd "${SKIA_DIR}"
# Apply all skqp patches for Mesa CI # Apply all skqp patches for Mesa CI
cat "${SKQP_PATCH_DIR}"/*.patch | cat "${SKQP_PATCH_DIR}"/build-skqp_*.patch |
patch -p1 patch -p1
# Fetch some needed build tools needed to build skia/skqp. # Fetch some needed build tools needed to build skia/skqp.

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

@@ -12,7 +12,7 @@ variables:
DEBIAN_X86_TEST_VK_TAG: "2022-04-05-deqp-runner" DEBIAN_X86_TEST_VK_TAG: "2022-04-05-deqp-runner"
FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5" FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5"
KERNEL_ROOTFS_TAG: "2022-04-05-deqp-runner" KERNEL_ROOTFS_TAG: "2022-04-07-prefix-skqp"
WINDOWS_X64_BUILD_PATH: "windows/x64_build" WINDOWS_X64_BUILD_PATH: "windows/x64_build"
WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split" WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"