X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=becc1c18da68eea594e218efbc1e36e08e5986a8;hb=e7e501efceca73b92727e9d295eda63d21e76afe;hp=8705ede471380a9bf9d73d49ce8e8484715c76a4;hpb=128581d0d840530bfe75b471167b742492f91a09;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8705ede4713..becc1c18da6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,20 +14,25 @@
 # repository's registry will be used there as well.
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-09-11"
-  DEBIAN_ARM64_TAG: "arm64v8-2019-08-09"
-  DEBIAN_VERSION: stretch-slim
-  DEBIAN_ARM64_VERSION: buster-slim
+  DEBIAN_TAG: "2019-10-29"
+  DEBIAN_ARM64_TAG: "arm64v8-2019-10-23"
+  STRETCH_TAG: "2019-09-18"
+  DEBIAN_VERSION: buster-slim
+  STRETCH_VERSION: stretch-slim
   DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
-  DEBIAN_ARM64_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_ARM64_VERSION:$DEBIAN_ARM64_TAG"
+  DEBIAN_ARM64_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_ARM64_TAG"
+  STRETCH_IMAGE: "$CI_REGISTRY_IMAGE/debian/$STRETCH_VERSION:$STRETCH_TAG"
 
 include:
   - project: 'wayland/ci-templates'
-    ref: 1f7f57c6
+    ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
     file: '/templates/debian.yml'
 
+include:
+  - local: '.gitlab-ci/lava-gitlab-ci.yml'
+
 stages:
-  - containers
+  - container
   - build
   - test
 
@@ -35,9 +40,27 @@ stages:
 # When to automatically run the CI
 .ci-run-policy:
   only:
-    - branches@mesa/mesa
-    - merge_requests
-    - /^ci([-/].*)?$/
+    refs:
+      - branches@mesa/mesa
+      - merge_requests
+      - /^ci([-/].*)?$/
+    changes:
+      - VERSION
+      - bin/**/*
+      # GitLab CI
+      - .gitlab-ci.yml
+      - .gitlab-ci/**/*
+      # Meson
+      - meson*
+      - build-support/**/*
+      - subprojects/**/*
+      # SCons
+      - SConstruct
+      - scons/**/*
+      - common.py
+      # Source code
+      - include/**/*
+      - src/**/*
   retry:
     max: 2
     when:
@@ -52,37 +75,56 @@ stages:
       # https://gitlab.com/gitlab-org/gitlab-ce/commit/8788fb925706cad594adf6917a6c5f6587dd1521
       - artifacts
 
-# Builds the normal CI native and cross-build docker image.
-debian:
+# Build the normal CI native and cross-build docker images.
+
+.container:
+  stage: container
   extends:
-    - .debian@container-ifnot-exists
     - .ci-run-policy
-  stage: containers
   variables:
-    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
+    # no need to pull the whole repo to build the container image
+    GIT_STRATEGY: none
+
+debian-10:amd64:
+  extends:
+    - .debian@container-ifnot-exists
+    - .container
+  variables:
     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:
+.use-debian-10:amd64:
+  image: $DEBIAN_IMAGE
+  needs:
+    - debian-10:amd64
+
+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:amd64:
+  image: $STRETCH_IMAGE
+  needs:
+    - debian-9:amd64
+
+debian-10:arm64:
   extends:
     - .debian@container-ifnot-exists@arm64v8
-    - .ci-run-policy
-  stage: containers
+    - .container
   variables:
     DEBIAN_TAG: "$DEBIAN_ARM64_TAG"
-    DEBIAN_VERSION: "$DEBIAN_ARM64_VERSION"
-    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
-    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
-  image: $DEBIAN_IMAGE
   stage: build
-  cache:
-    paths:
-      - ccache
   artifacts:
     when: always
     paths:
@@ -90,6 +132,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
@@ -97,6 +147,7 @@ test-container:arm64:
     - 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:
@@ -109,21 +160,30 @@ 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
+  extends:
+    - .build-linux
+    - .use-debian-10:amd64
   script:
     - .gitlab-ci/meson-build.sh
 
 .scons-build:
-  extends: .build
+  extends:
+    - .build-linux
+    - .use-debian-10:amd64
   variables:
     SCONSFLAGS: "-j4"
   script:
-    - if test -n "$LLVM_VERSION"; then
-        export LLVM_CONFIG="llvm-config-${LLVM_VERSION}";
-      fi
-    - scons $SCONS_TARGET
-    - eval $SCONS_CHECK_COMMAND
+    - .gitlab-ci/scons-build.sh
 
 meson-main:
   extends:
@@ -147,7 +207,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
@@ -155,6 +215,52 @@ meson-main:
     MESON_SHADERDB: "true"
     BUILDTYPE: "debugoptimized"
 
+.meson-cross:
+  extends:
+    - .meson-build
+  variables:
+    UNWIND: "false"
+    DRI_LOADERS: >
+      -D glx=disabled
+      -D gbm=false
+      -D egl=true
+      -D platforms=surfaceless
+      -D osmesa=none
+    GALLIUM_ST: >
+      -D dri3=false
+      -D gallium-vdpau=false
+      -D gallium-xvmc=false
+      -D gallium-omx=disabled
+      -D gallium-va=false
+      -D gallium-xa=false
+      -D gallium-nine=false
+
+.meson-arm:
+  extends: .meson-cross
+  image: $DEBIAN_ARM64_IMAGE
+  variables:
+    VULKAN_DRIVERS: freedreno
+    GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4"
+    EXTRA_OPTION: >
+      -D I-love-half-baked-turnips=true
+  needs:
+    - debian-10:arm64
+  tags:
+    - aarch64
+
+meson-armhf:
+  extends: .meson-arm
+  variables:
+    CROSS: armhf
+    LLVM_VERSION: "7"
+
+meson-arm64:
+  extends:
+    - .meson-arm
+    - .ci-deqp-artifacts
+  variables:
+    BUILDTYPE: "debugoptimized"
+
 # NOTE: Building SWR is 2x (yes two) times slower than all the other
 # gallium drivers combined.
 # Start this early so that it doesn't limit the total run time.
@@ -189,11 +295,15 @@ meson-clang:
     VULKAN_DRIVERS: intel,amd,freedreno
     CC: "ccache clang-8"
     CXX: "ccache clang++-8"
+
+.meson-windows:
+  extends:
+    - .build-windows
   before_script:
-    - export CCACHE_BASEDIR="$PWD" CCACHE_DIR="$PWD/ccache"
-    - ccache --zero-stats --show-stats || true
-     # clang++ breaks if it picks up the GCC 8 directory without libstdc++.so
-    - apt-get remove -y libgcc-8-dev
+    - $ENV:ARCH = "x86"
+    - $ENV:VERSION = "2019\Community"
+  script:
+    - cmd /C .gitlab-ci\meson-build.bat
 
 scons-swr:
   extends: .scons-build
@@ -230,11 +340,25 @@ meson-clover:
     - .gitlab-ci/meson-build.sh
     - LLVM_VERSION=8 .gitlab-ci/meson-build.sh
     - export GALLIUM_DRIVERS="i915,r600"
+    - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh
+    - LLVM_VERSION=7 .gitlab-ci/meson-build.sh
+
+meson-clover-old-llvm:
+  extends:
+    - meson-clover
+    - .use-debian-9:amd64
+  variables:
+    UNWIND: "false"
+    DRI_LOADERS: >
+      -D glx=disabled
+      -D egl=false
+      -D gbm=false
+      -D platforms=drm,surfaceless
+    GALLIUM_DRIVERS: "i915,r600"
+  script:
     - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh
     - LLVM_VERSION=4.0 .gitlab-ci/meson-build.sh
     - LLVM_VERSION=5.0 .gitlab-ci/meson-build.sh
-    - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh
-    - LLVM_VERSION=7 .gitlab-ci/meson-build.sh
 
 meson-vulkan:
   extends: .meson-build
@@ -255,53 +379,15 @@ 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: >
       -D vulkan-overlay-layer=true
 
-.meson-cross:
-  extends:
-    - .meson-build
-    - .ci-deqp-artifacts
-  variables:
-    UNWIND: "false"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D gbm=false
-      -D egl=true
-      -D platforms=surfaceless
-      -D osmesa=none
-    GALLIUM_ST: >
-      -D dri3=false
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
-      -D gallium-nine=false
-      -D llvm=false
-  script:
-    - .gitlab-ci/meson-build.sh
-
-meson-armhf:
-  extends: .meson-cross
-  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.
-    EXTRA_OPTION: >
-      -D build-tests=false
-      -D I-love-half-baked-turnips=true
-      -D vulkan-overlay-layer=true
-
-meson-arm64:
-  extends: meson-armhf
-  variables:
-    CROSS: arm64
-    BUILDTYPE: "debugoptimized"
-
 # While the main point of this build is testing the i386 cross build,
 # we also use this one to test some other options that are exclusive
 # with meson-main's choices (classic swrast and osmesa)
@@ -312,33 +398,53 @@ meson-i386:
     VULKAN_DRIVERS: intel
     DRI_DRIVERS: "swrast"
     GALLIUM_DRIVERS: "iris"
-    # Disable i386 tests, because u_format_tests gets precision
-    # failures in dxtn unpacking
     EXTRA_OPTION: >
-      -D build-tests=false
       -D vulkan-overlay-layer=true
       -D llvm=false
       -D osmesa=classic
 
-scons-nollvm:
-  extends: .scons-build
+meson-mingw32-x86_64:
+  extends: .meson-build
   variables:
-    SCONS_TARGET: "llvm=0"
-    SCONS_CHECK_COMMAND: "scons llvm=0 check"
+    UNWIND: "false"
+    DRI_DRIVERS: ""
+    GALLIUM_DRIVERS: "swrast"
+    EXTRA_OPTION: >
+      -Dllvm=false
+      -Dosmesa=gallium
+      --cross-file=.gitlab-ci/x86_64-w64-mingw32
 
-scons-llvm:
+scons:
   extends: .scons-build
   variables:
     SCONS_TARGET: "llvm=1"
-    SCONS_CHECK_COMMAND: "scons llvm=1 check"
-    LLVM_VERSION: "3.9"
+    SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check"
+  script:
+    - 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
 
-.deqp-test:
+scons-old-llvm:
+  extends:
+    - scons
+    - .use-debian-9:amd64
+  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
+
+.test:
   extends: .ci-run-policy
   stage: test
-  image: $DEBIAN_IMAGE
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
+
+.deqp-test:
+  extends:
+    - .test
+    - .use-debian-10:amd64
+  variables:
     DEQP_SKIPS: deqp-default-skips.txt
   script:
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
@@ -350,6 +456,11 @@ scons-llvm:
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
     paths:
       - results/
+  dependencies:
+    - meson-main
+  needs:
+    - meson-main
+    - debian-10:amd64
 
 test-llvmpipe-gles2:
   parallel: 4
@@ -359,9 +470,6 @@ test-llvmpipe-gles2:
     LIBGL_ALWAYS_SOFTWARE: "true"
     DEQP_RENDERER_MATCH: "llvmpipe"
   extends: .deqp-test
-  dependencies:
-    - meson-main
-  needs: [meson-main]
 
 test-softpipe-gles2:
   extends: test-llvmpipe-gles2
@@ -383,9 +491,6 @@ test-softpipe-gles3-limited:
     CI_NODE_INDEX: 1
     CI_NODE_TOTAL: 10
   extends: .deqp-test
-  dependencies:
-    - meson-main
-  needs: [meson-main]
 
 arm64_a630_gles2:
   extends: .deqp-test
@@ -400,7 +505,9 @@ arm64_a630_gles2:
     - mesa-cheza
   dependencies:
     - meson-arm64
-  needs: [ meson-arm64 ]
+  needs:
+    - meson-arm64
+    - debian-10:arm64
 
 arm64_a630_gles31:
   extends: arm64_a630_gles2