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

ci: fix build-kernel.sh -> download-prebuilt-kernel.sh

Browse Source 
Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29241>
This commit is contained in:
Eric Engestrom
2024-05-03 12:54:11 +02:00
parent 2abdc84606
commit 27592453ac
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@ apt-get install -y --no-install-recommends "${EPHEMERAL[@]}"
. .gitlab-ci/container/container_pre_build.sh . .gitlab-ci/container/container_pre_build.sh
############### Build kernel ############### Download prebuilt kernel
export DEFCONFIG="arch/x86/configs/x86_64_defconfig" export DEFCONFIG="arch/x86/configs/x86_64_defconfig"
export KERNEL_IMAGE_NAME=bzImage export KERNEL_IMAGE_NAME=bzImage
@@ -121,7 +121,7 @@ export KERNEL_ARCH=x86_64
export DEBIAN_ARCH=amd64 export DEBIAN_ARCH=amd64
mkdir -p /lava-files/ mkdir -p /lava-files/
. .gitlab-ci/container/build-kernel.sh . .gitlab-ci/container/download-prebuilt-kernel.sh
# Needed for ci-fairy, this revision is able to upload files to MinIO # Needed for ci-fairy, this revision is able to upload files to MinIO
# and doesn't depend on git # and doesn't depend on git

0
.gitlab-ci/container/build-kernel.sh → .gitlab-ci/container/download-prebuilt-kernel.sh
View File

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

@@ -327,8 +327,8 @@ if [[ -e ".gitlab-ci/local/build-rootfs.sh" ]]; then
fi fi
############### Build kernel ############### Download prebuilt kernel
. .gitlab-ci/container/build-kernel.sh . .gitlab-ci/container/download-prebuilt-kernel.sh
############### Delete rust, since the tests won't be compiling anything. ############### Delete rust, since the tests won't be compiling anything.
rm -rf /root/.cargo rm -rf /root/.cargo