projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nir/constant_folding: fold load_constant intrinsics
[mesa.git]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index 170b2cb1a0d19486c588c920b29c6ca1ae5b1a6f..f245ee687c11e3b54ad2349274afbfb1c497ee7c 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-14,7
+14,7
@@
# repository's registry will be used there as well.
variables:
UPSTREAM_REPO: mesa/mesa
# repository's registry will be used there as well.
variables:
UPSTREAM_REPO: mesa/mesa
- DEBIAN_TAG: "2019-09-
18
"
+ DEBIAN_TAG: "2019-09-
30
"
DEBIAN_ARM64_TAG: "arm64v8-2019-08-09"
STRETCH_TAG: "2019-09-18"
DEBIAN_VERSION: buster-slim
DEBIAN_ARM64_TAG: "arm64v8-2019-08-09"
STRETCH_TAG: "2019-09-18"
DEBIAN_VERSION: buster-slim
@@
-28,6
+28,9
@@
include:
ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
file: '/templates/debian.yml'
ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
file: '/templates/debian.yml'
+include:
+ - local: '/.gitlab-ci/lava-gitlab-ci.yml'
+
stages:
- containers
- build
stages:
- containers
- build
@@
-73,6
+76,11
@@
debian-9:
DEBIAN_IMAGE: $STRETCH_IMAGE
DEBIAN_EXEC: 'bash .gitlab-ci/debian-stretch-install.sh'
DEBIAN_IMAGE: $STRETCH_IMAGE
DEBIAN_EXEC: 'bash .gitlab-ci/debian-stretch-install.sh'
+.use-debian-9:
+ image: $STRETCH_IMAGE
+ needs:
+ - debian-9
+
# Builds a Docker image with the native environment and VK-GL-CTS for testing.
test-container:arm64:
extends:
# Builds a Docker image with the native environment and VK-GL-CTS for testing.
test-container:arm64:
extends:
@@
-89,8
+97,11
@@
test-container:arm64:
.build:
extends: .ci-run-policy
image: $DEBIAN_IMAGE
.build:
extends: .ci-run-policy
image: $DEBIAN_IMAGE
+ needs:
+ - debian-10
stage: build
cache:
stage: build
cache:
+ key: ${CI_JOB_NAME}
paths:
- ccache
artifacts:
paths:
- ccache
artifacts:
@@
-107,6
+118,7
@@
test-container:arm64:
- export PATH="/usr/lib/ccache:$PATH"
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
- export PATH="/usr/lib/ccache:$PATH"
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
+ - ccache --max-size=1500M
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
@@
-277,8
+289,9
@@
meson-clover:
- LLVM_VERSION=7 .gitlab-ci/meson-build.sh
meson-clover-old-llvm:
- LLVM_VERSION=7 .gitlab-ci/meson-build.sh
meson-clover-old-llvm:
- extends: meson-clover
- image: $STRETCH_IMAGE
+ extends:
+ - meson-clover
+ - .use-debian-9
variables:
UNWIND: "false"
DRI_LOADERS: >
variables:
UNWIND: "false"
DRI_LOADERS: >
@@
-331,24
+344,25
@@
meson-i386:
-D llvm=false
-D osmesa=classic
-D llvm=false
-D osmesa=classic
-scons-nollvm:
- extends: .scons-build
- variables:
- SCONS_TARGET: "llvm=0"
- SCONS_CHECK_COMMAND: "scons llvm=0 check"
-
-scons-llvm:
+scons:
extends: .scons-build
variables:
SCONS_TARGET: "llvm=1"
SCONS_CHECK_COMMAND: "scons llvm=1 check"
extends: .scons-build
variables:
SCONS_TARGET: "llvm=1"
SCONS_CHECK_COMMAND: "scons llvm=1 check"
- LLVM_VERSION: "6.0"
+ script:
+ - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check" .gitlab-ci/scons-build.sh
+ - LLVM_VERSION=6.0 .gitlab-ci/scons-build.sh
+ - LLVM_VERSION=7 .gitlab-ci/scons-build.sh
+ - LLVM_VERSION=8 .gitlab-ci/scons-build.sh
scons-old-llvm:
scons-old-llvm:
- extends: scons-llvm
- image: $STRETCH_IMAGE
- variables:
- LLVM_VERSION: "3.9"
+ extends:
+ - scons
+ - .use-debian-9
+ script:
+ - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
+ - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh
+ - LLVM_VERSION=5.0 .gitlab-ci/scons-build.sh
.deqp-test:
extends: .ci-run-policy
.deqp-test:
extends: .ci-run-policy
@@
-414,7
+428,9
@@
arm64_a630_gles2:
- mesa-cheza
dependencies:
- meson-arm64
- mesa-cheza
dependencies:
- meson-arm64
- needs: [ meson-arm64 ]
+ needs:
+ - meson-arm64
+ - test-container:arm64
arm64_a630_gles31:
extends: arm64_a630_gles2
arm64_a630_gles31:
extends: arm64_a630_gles2