diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2019-09-06 17:35:52 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2019-09-16 12:51:34 +0200 |
| commit | e426f400972854d2f13599737cec04ec147ada1b (patch) | |
| tree | 58e77421044d29e198bebc6fe953de79fb1e4c95 /.gitlab-ci.yml | |
| parent | 0173e9b1ca012e5e32f8d7b702fb61cb00792455 (diff) | |
| download | mesa-e426f400972854d2f13599737cec04ec147ada1b.tar.gz | |
gitlab-ci: Use multiple inheritance instead of YAML references
Support for multiple inheritance was added to GitLab recently.
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index effb3c16014..d98129241e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ stages: # When to automatically run the CI -.ci-run-policy: &ci-run-policy +.ci-run-policy: only: - branches@mesa/mesa - merge_requests @@ -43,7 +43,7 @@ stages: when: - runner_system_failure -.ci-deqp-artifacts: &ci-deqp-artifacts +.ci-deqp-artifacts: artifacts: when: always untracked: false @@ -54,17 +54,19 @@ stages: # Builds the normal CI native and cross-build docker image. debian: - extends: .debian@container-ifnot-exists + extends: + - .debian@container-ifnot-exists + - .ci-run-policy stage: containers - <<: *ci-run-policy variables: GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' # Builds a Docker image with the native environment and VK-GL-CTS for testing. test-container:arm64: - extends: .debian@container-ifnot-exists@arm64v8 - <<: *ci-run-policy + extends: + - .debian@container-ifnot-exists@arm64v8 + - .ci-run-policy stage: containers variables: DEBIAN_TAG: "$DEBIAN_ARM64_TAG" @@ -75,7 +77,7 @@ test-container:arm64: # BUILD .build: - <<: *ci-run-policy + extends: .ci-run-policy image: $DEBIAN_IMAGE stage: build cache: @@ -124,7 +126,9 @@ test-container:arm64: - eval $SCONS_CHECK_COMMAND meson-main: - extends: .meson-build + extends: + - .meson-build + - .ci-deqp-artifacts variables: UNWIND: "true" DRI_LOADERS: > @@ -150,7 +154,6 @@ meson-main: -D tools=all MESON_SHADERDB: "true" BUILDTYPE: "debugoptimized" - <<: *ci-deqp-artifacts # NOTE: Building SWR is 2x (yes two) times slower than all the other # gallium drivers combined. @@ -258,7 +261,9 @@ meson-vulkan: -D vulkan-overlay-layer=true .meson-cross: - extends: .meson-build + extends: + - .meson-build + - .ci-deqp-artifacts variables: UNWIND: "false" DRI_LOADERS: > @@ -276,7 +281,6 @@ meson-vulkan: -D gallium-xa=false -D gallium-nine=false -D llvm=false - <<: *ci-deqp-artifacts script: - .gitlab-ci/meson-build.sh @@ -337,7 +341,7 @@ scons-llvm: LLVM_VERSION: "3.9" .deqp-test: - <<: *ci-run-policy + extends: .ci-run-policy stage: test image: $DEBIAN_IMAGE variables: |