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

ci/bare-metal: Don't include dev packages in arm*test.

Browse Source 
We just need these to build our rootfs, clean them out afterwards.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5433>
This commit is contained in:
Eric Anholt
2020-06-10 14:17:23 -07:00
committed by Marge Bot
parent 9079b53987
commit acf9d8b75d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -305,7 +305,7 @@ arm64_test:
extends: extends:
- .use-arm_test-base - .use-arm_test-base
variables: variables:
FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-stable" FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-ephemeral"
.use-arm64_test: .use-arm64_test:
variables: variables:

7
.gitlab-ci/container/baremetal_build.sh
View File

@@ -7,7 +7,7 @@ dpkg --add-architecture $arch
apt-get update apt-get update
# Cross-build test deps # Cross-build test deps
apt-get install -y --no-remove \ BAREMETAL_EPHEMERAL=" \
crossbuild-essential-$arch \ crossbuild-essential-$arch \
libdrm-dev:$arch \ libdrm-dev:$arch \
libegl1-mesa-dev:$arch \ libegl1-mesa-dev:$arch \
@@ -21,6 +21,9 @@ apt-get install -y --no-remove \
libtinfo-dev:$arch \ libtinfo-dev:$arch \
libegl1-mesa-dev:$arch \ libegl1-mesa-dev:$arch \
libvulkan-dev:$arch libvulkan-dev:$arch
"
apt-get install -y --no-remove $BAREMETAL_EPHEMERAL
mkdir /var/cache/apt/archives/$arch mkdir /var/cache/apt/archives/$arch
@@ -37,3 +40,5 @@ DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_arm.sh
ccache --show-stats ccache --show-stats
. .gitlab-ci/container/container_post_build.sh . .gitlab-ci/container/container_post_build.sh
apt-get purge -y $BAREMETAL_EPHEMERAL