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

ci: move shader-db clone/build into its own script

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24504>
This commit is contained in:
Eric Engestrom
2023-08-04 18:22:55 +01:00
committed by Marge Bot
parent e7c0971b4f
commit 2e100bd69b
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci/container/build-shader-db.sh Normal file
View File

@@ -0,0 +1,14 @@
#!/usr/bin/env bash
# When changing this file, you need to bump the following
# .gitlab-ci/image-tags.yml tags:
# DEBIAN_BUILD_TAG
set -ex
pushd /usr/local
git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
rm -rf shader-db/.git
cd shader-db
make
popd

7
.gitlab-ci/container/debian/x86_64_build.sh
View File

@@ -78,12 +78,7 @@ rm -rf $XORGMACROS_VERSION
. .gitlab-ci/container/build-wayland.sh
pushd /usr/local
git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
rm -rf shader-db/.git
cd shader-db
make
popd
. .gitlab-ci/container/build-shader-db.sh
git clone https://github.com/microsoft/DirectX-Headers -b v1.711.3-preview --depth 1
pushd DirectX-Headers

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

@@ -10,7 +10,7 @@ variables:
DEBIAN_BASE_TAG: "2023-09-25-virglrenderer"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "2023-09-14-bindgen-cli"
DEBIAN_BUILD_TAG: "2023-09-30-shader-db"
DEBIAN_X86_64_BUILD_MINGW_IMAGE_PATH: "debian/x86_64_build-mingw"
DEBIAN_BUILD_MINGW_TAG: "2023-05-25-bookworm"