mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-27 04:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

gitlab-ci: Use multiple inheritance instead of YAML references

Browse Source 
Support for multiple inheritance was added to GitLab recently.

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Michel Dänzer 2019-09-06 17:35:52 +02:00 committed by Michel Dänzer
parent 0173e9b1ca
commit e426f40097
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.gitlab-ci.yml
View File

@ -33,7 +33,7 @@ stages:
# When to automatically run the CI # When to automatically run the CI
.ci-run-policy: &ci-run-policy .ci-run-policy:
only: only:
- branches@mesa/mesa - branches@mesa/mesa
- merge_requests - merge_requests
@ -43,7 +43,7 @@ stages:
when: when:
- runner_system_failure - runner_system_failure
.ci-deqp-artifacts: &ci-deqp-artifacts .ci-deqp-artifacts:
artifacts: artifacts:
when: always when: always
untracked: false untracked: false
@ -54,17 +54,19 @@ stages:
# Builds the normal CI native and cross-build docker image. # Builds the normal CI native and cross-build docker image.
debian: debian:
extends: .debian@container-ifnot-exists extends:
- .debian@container-ifnot-exists
- .ci-run-policy
stage: containers stage: containers
<<: *ci-run-policy
variables: variables:
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
# Builds a Docker image with the native environment and VK-GL-CTS for testing. # Builds a Docker image with the native environment and VK-GL-CTS for testing.
test-container:arm64: test-container:arm64:
extends: .debian@container-ifnot-exists@arm64v8 extends:
<<: *ci-run-policy - .debian@container-ifnot-exists@arm64v8
- .ci-run-policy
stage: containers stage: containers
variables: variables:
DEBIAN_TAG: "$DEBIAN_ARM64_TAG" DEBIAN_TAG: "$DEBIAN_ARM64_TAG"
@ -75,7 +77,7 @@ test-container:arm64:
# BUILD # BUILD
.build: .build:
<<: *ci-run-policy extends: .ci-run-policy
image: $DEBIAN_IMAGE image: $DEBIAN_IMAGE
stage: build stage: build
cache: cache:
@ -124,7 +126,9 @@ test-container:arm64:
- eval $SCONS_CHECK_COMMAND - eval $SCONS_CHECK_COMMAND
meson-main: meson-main:
extends: .meson-build extends:
- .meson-build
- .ci-deqp-artifacts
variables: variables:
UNWIND: "true" UNWIND: "true"
DRI_LOADERS: > DRI_LOADERS: >
@ -150,7 +154,6 @@ meson-main:
-D tools=all -D tools=all
MESON_SHADERDB: "true" MESON_SHADERDB: "true"
BUILDTYPE: "debugoptimized" BUILDTYPE: "debugoptimized"
<<: *ci-deqp-artifacts
# NOTE: Building SWR is 2x (yes two) times slower than all the other # NOTE: Building SWR is 2x (yes two) times slower than all the other
# gallium drivers combined. # gallium drivers combined.
@ -258,7 +261,9 @@ meson-vulkan:
-D vulkan-overlay-layer=true -D vulkan-overlay-layer=true
.meson-cross: .meson-cross:
extends: .meson-build extends:
- .meson-build
- .ci-deqp-artifacts
variables: variables:
UNWIND: "false" UNWIND: "false"
DRI_LOADERS: > DRI_LOADERS: >
@ -276,7 +281,6 @@ meson-vulkan:
-D gallium-xa=false -D gallium-xa=false
-D gallium-nine=false -D gallium-nine=false
-D llvm=false -D llvm=false
<<: *ci-deqp-artifacts
script: script:
- .gitlab-ci/meson-build.sh - .gitlab-ci/meson-build.sh
@ -337,7 +341,7 @@ scons-llvm:
LLVM_VERSION: "3.9" LLVM_VERSION: "3.9"
.deqp-test: .deqp-test:
<<: *ci-run-policy extends: .ci-run-policy
stage: test stage: test
image: $DEBIAN_IMAGE image: $DEBIAN_IMAGE
variables: variables: