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

ci: Add clang-format to the amd64 container

Browse Source 
We need clang-format available in order to check for formatting errors later.
Add it to the amd64 container only (this requires some shenigans to avoid
multi-arch conflicts).

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20553>
This commit is contained in:
Alyssa Rosenzweig
2023-03-09 20:35:10 -05:00
committed by Marge Bot
parent d2621ef81d
commit 5c1b360eaa
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci/container/cross_build.sh
View File

@@ -47,6 +47,11 @@ if [[ $arch != "armhf" ]]; then
LLVM=11 LLVM=11
fi fi
# We don't need clang-format for the crossbuilds, but the installed amd64
# package will conflict with libclang. Uninstall clang-format (and its
# problematic dependency) to fix.
apt-get remove -y clang-format-13 libclang-cpp13
# llvm-*-tools:$arch conflicts with python3:amd64. Install dependencies only # llvm-*-tools:$arch conflicts with python3:amd64. Install dependencies only
# with apt-get, then force-install llvm-*-{dev,tools}:$arch with dpkg to get # with apt-get, then force-install llvm-*-{dev,tools}:$arch with dpkg to get
# around this. # around this.

1
.gitlab-ci/container/debian/x86_build-base.sh
View File

@@ -28,6 +28,7 @@ apt-get install -y --no-remove \
bison \ bison \
ccache \ ccache \
curl \ curl \
clang-format-13 \
dpkg-cross \ dpkg-cross \
findutils \ findutils \
flex \ flex \

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

@@ -1,6 +1,6 @@
variables: variables:
DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
DEBIAN_BASE_TAG: "2023-03-13-virglrenderer-crosvm" DEBIAN_BASE_TAG: "2023-03-16-clang-format"
DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
DEBIAN_BUILD_TAG: "2023-02-14-pip" DEBIAN_BUILD_TAG: "2023-02-14-pip"