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

ci/build: deduplicate meson build command

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31846>
This commit is contained in:
Eric Engestrom
2024-10-24 23:53:48 +02:00
committed by Marge Bot
parent d3533716f9
commit f5f82fdff5
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
.gitlab-ci/build/gitlab-ci.yml
View File

@@ -60,7 +60,7 @@
variables: variables:
LLVM_VERSION: 15 LLVM_VERSION: 15
script: script:
- .gitlab-ci/meson/build.sh - &meson-build .gitlab-ci/meson/build.sh
# Make sure this list stays the same as all the jobs with # Make sure this list stays the same as all the jobs with
@@ -117,7 +117,7 @@ debian-testing:
S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE} S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE}
LLVM_VERSION: 15 LLVM_VERSION: 15
script: script:
- .gitlab-ci/meson/build.sh - *meson-build
- .gitlab-ci/prepare-artifacts.sh - .gitlab-ci/prepare-artifacts.sh
artifacts: artifacts:
reports: reports:
@@ -212,9 +212,9 @@ debian-build-testing:
-D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
LLVM_VERSION: 15 LLVM_VERSION: 15
S3_ARTIFACT_NAME: debian-build-testing S3_ARTIFACT_NAME: debian-build-testing
script: | script:
.gitlab-ci/meson/build.sh - *meson-build
.gitlab-ci/prepare-artifacts.sh - .gitlab-ci/prepare-artifacts.sh
shader-db: shader-db:
stage: code-validation stage: code-validation
@@ -285,7 +285,7 @@ debian-release:
BUILDTYPE: "release" BUILDTYPE: "release"
S3_ARTIFACT_NAME: "mesa-x86_64-default-${BUILDTYPE}" S3_ARTIFACT_NAME: "mesa-x86_64-default-${BUILDTYPE}"
script: script:
- .gitlab-ci/meson/build.sh - *meson-build
- 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi' - 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi'
alpine-build-testing: alpine-build-testing:
@@ -435,13 +435,19 @@ debian-android:
ARTIFACTS_DEBUG_SYMBOLS: 1 ARTIFACTS_DEBUG_SYMBOLS: 1
S3_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE} S3_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE}
script: script:
- CROSS=aarch64-linux-android GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d VULKAN_DRIVERS=freedreno,broadcom,virtio .gitlab-ci/meson/build.sh - export CROSS=aarch64-linux-android
- export GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d
- export VULKAN_DRIVERS=freedreno,broadcom,virtio
- *meson-build
# x86_64 build: # x86_64 build:
# Can't do Intel because gen_decoder.c currently requires libexpat, which # Can't do Intel because gen_decoder.c currently requires libexpat, which
# is not a dependency that AOSP wants to accept. Can't do Radeon Gallium # is not a dependency that AOSP wants to accept. Can't do Radeon Gallium
# drivers because they requires LLVM, which we don't have an Android build # drivers because they requires LLVM, which we don't have an Android build
# of. # of.
- CROSS=x86_64-linux-android GALLIUM_DRIVERS=iris,virgl VULKAN_DRIVERS=amd,intel .gitlab-ci/meson/build.sh - export CROSS=x86_64-linux-android
- export GALLIUM_DRIVERS=iris,virgl
- export VULKAN_DRIVERS=amd,intel
- *meson-build
- .gitlab-ci/prepare-artifacts.sh - .gitlab-ci/prepare-artifacts.sh
.meson-cross: .meson-cross:
@@ -494,7 +500,7 @@ debian-arm32:
# tempfiles in our artifacts. # tempfiles in our artifacts.
ARTIFACTS_DEBUG_SYMBOLS: 1 ARTIFACTS_DEBUG_SYMBOLS: 1
script: script:
- .gitlab-ci/meson/build.sh - *meson-build
- .gitlab-ci/prepare-artifacts.sh - .gitlab-ci/prepare-artifacts.sh
debian-arm32-asan: debian-arm32-asan:
@@ -535,7 +541,7 @@ debian-arm64:
-D gallium-rusticl=true -D gallium-rusticl=true
S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE} S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
script: script:
- .gitlab-ci/meson/build.sh - *meson-build
- .gitlab-ci/prepare-artifacts.sh - .gitlab-ci/prepare-artifacts.sh
debian-arm64-asan: debian-arm64-asan:
@@ -582,7 +588,7 @@ debian-arm64-release:
-Wno-error=stringop-truncation -Wno-error=stringop-truncation
-Wno-error=stringop-overread -Wno-error=stringop-overread
script: script:
- .gitlab-ci/meson/build.sh - *meson-build
- 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi' - 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi'
debian-no-libdrm: debian-no-libdrm: