X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=ac8dfefccc359f799034813ebda73a0046503a5d;hb=8818e0df742120858b2460a2208fac57d242473a;hp=258430d4449559677adfb0bf72c02e345b0762fd;hpb=3bcd54f3fc2051dfb49d8c6afeb1f18f7cd9c0b7;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 258430d4449..ac8dfefccc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,8 +14,8 @@ # repository's registry will be used there as well. variables: UPSTREAM_REPO: mesa/mesa - DEBIAN_TAG: "2019-10-07_1" - DEBIAN_ARM64_TAG: "arm64v8-2019-08-09" + DEBIAN_TAG: "2019-10-23" + DEBIAN_ARM64_TAG: "arm64v8-2019-10-23" STRETCH_TAG: "2019-09-18" DEBIAN_VERSION: buster-slim STRETCH_VERSION: stretch-slim @@ -29,7 +29,7 @@ include: file: '/templates/debian.yml' include: - - local: '/.gitlab-ci/lava-gitlab-ci.yml' + - local: '.gitlab-ci/lava-gitlab-ci.yml' stages: - container @@ -67,50 +67,46 @@ stages: # no need to pull the whole repo to build the container image GIT_STRATEGY: none -debian-10: +debian-10:amd64: extends: - .debian@container-ifnot-exists - .container variables: DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' -.use-debian-10: +.use-debian-10:amd64: image: $DEBIAN_IMAGE needs: - - debian-10 + - debian-10:amd64 -debian-9: - extends: debian-10 +debian-9:amd64: + extends: debian-10:amd64 variables: DEBIAN_TAG: $STRETCH_TAG DEBIAN_VERSION: $STRETCH_VERSION DEBIAN_IMAGE: $STRETCH_IMAGE DEBIAN_EXEC: 'bash .gitlab-ci/debian-stretch-install.sh' -.use-debian-9: +.use-debian-9:amd64: image: $STRETCH_IMAGE needs: - - debian-9 + - debian-9:amd64 -# Builds a Docker image with the native environment and VK-GL-CTS for testing. -test-container:arm64: +debian-10:arm64: extends: - .debian@container-ifnot-exists@arm64v8 - .container variables: DEBIAN_TAG: "$DEBIAN_ARM64_TAG" - DEBIAN_EXEC: 'bash .gitlab-ci/debian-test-install.sh' + DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-install.sh' # BUILD -.build: +# Shared between windows and Linux +.build-common: extends: .ci-run-policy stage: build - cache: - key: ${CI_JOB_NAME} - paths: - - ccache artifacts: when: always paths: @@ -118,6 +114,14 @@ test-container:arm64: # scons: - build/*/config.log - shader-db + +# Just Linux +.build-linux: + extends: .build-common + cache: + key: ${CI_JOB_NAME} + paths: + - ccache variables: CCACHE_COMPILERCHECK: "content" # Use ccache transparently, and print stats before/after @@ -138,17 +142,26 @@ test-container:arm64: - export CCACHE_DIR="$PWD/ccache" - ccache --show-stats +.build-windows: + extends: .build-common + tags: + - mesa-windows + cache: + key: ${CI_JOB_NAME} + paths: + - subprojects/packagecache + .meson-build: extends: - - .build - - .use-debian-10 + - .build-linux + - .use-debian-10:amd64 script: - .gitlab-ci/meson-build.sh .scons-build: extends: - - .build - - .use-debian-10 + - .build-linux + - .use-debian-10:amd64 variables: SCONSFLAGS: "-j4" script: @@ -176,7 +189,7 @@ meson-main: -D gallium-xa=true -D gallium-nine=true -D gallium-opencl=disabled - GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima" + GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" LLVM_VERSION: "7" EXTRA_OPTION: > -D osmesa=gallium @@ -187,7 +200,6 @@ meson-main: .meson-cross: extends: - .meson-build - - .ci-deqp-artifacts variables: UNWIND: "false" DRI_LOADERS: > @@ -204,24 +216,31 @@ meson-main: -D gallium-va=false -D gallium-xa=false -D gallium-nine=false - -D llvm=false -meson-armhf: +.meson-arm: extends: .meson-cross + image: $DEBIAN_ARM64_IMAGE variables: - CROSS: armhf VULKAN_DRIVERS: freedreno - GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4" - # Disable the tests since we're cross compiling. + GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4" EXTRA_OPTION: > - -D build-tests=false -D I-love-half-baked-turnips=true - -D vulkan-overlay-layer=true + needs: + - debian-10:arm64 + tags: + - aarch64 + +meson-armhf: + extends: .meson-arm + variables: + CROSS: armhf + LLVM_VERSION: "7" meson-arm64: - extends: meson-armhf + extends: + - .meson-arm + - .ci-deqp-artifacts variables: - CROSS: arm64 BUILDTYPE: "debugoptimized" # NOTE: Building SWR is 2x (yes two) times slower than all the other @@ -259,6 +278,15 @@ meson-clang: CC: "ccache clang-8" CXX: "ccache clang++-8" +meson-windows: + extends: + - .build-windows + before_script: + - $ENV:ARCH = "x86" + - $ENV:VERSION = "2019\Community" + script: + - cmd /C .gitlab-ci\meson-build.bat + scons-swr: extends: .scons-build variables: @@ -300,7 +328,7 @@ meson-clover: meson-clover-old-llvm: extends: - meson-clover - - .use-debian-9 + - .use-debian-9:amd64 variables: UNWIND: "false" DRI_LOADERS: > @@ -333,6 +361,10 @@ meson-vulkan: -D gallium-xa=false -D gallium-nine=false -D gallium-opencl=disabled + -D b_sanitize=undefined + -D c_args=-fno-sanitize-recover=all + -D cpp_args=-fno-sanitize-recover=all + UBSAN_OPTIONS: "print_stacktrace=1" VULKAN_DRIVERS: intel,amd,freedreno LLVM_VERSION: "8" EXTRA_OPTION: > @@ -353,7 +385,7 @@ meson-i386: -D llvm=false -D osmesa=classic -.meson-mingw32-x86_64: +meson-mingw32-x86_64: extends: .meson-build variables: UNWIND: "false" @@ -368,9 +400,9 @@ scons: extends: .scons-build variables: SCONS_TARGET: "llvm=1" - SCONS_CHECK_COMMAND: "scons llvm=1 check" + SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check" script: - - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check" .gitlab-ci/scons-build.sh + - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .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 @@ -378,7 +410,7 @@ scons: scons-old-llvm: extends: - scons - - .use-debian-9 + - .use-debian-9:amd64 script: - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh @@ -393,7 +425,7 @@ scons-old-llvm: .deqp-test: extends: - .test - - .use-debian-10 + - .use-debian-10:amd64 variables: DEQP_SKIPS: deqp-default-skips.txt script: @@ -408,7 +440,9 @@ scons-old-llvm: - results/ dependencies: - meson-main - needs: [meson-main] + needs: + - meson-main + - debian-10:amd64 test-llvmpipe-gles2: parallel: 4 @@ -455,7 +489,7 @@ arm64_a630_gles2: - meson-arm64 needs: - meson-arm64 - - test-container:arm64 + - debian-10:arm64 arm64_a630_gles31: extends: arm64_a630_gles2