X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=a81833d569822ea56460d5f09a4d0007fd41b4e4;hb=2e22879115b9b24d401006ab35674fc8537f155f;hp=f667cfd74c067709d65cbd0532452cc7af9c2305;hpb=d73265e20ddbc4208ff35e3ee5d89a8b3161a3d7;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f667cfd74c0..a81833d5698 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,104 +12,74 @@ # main repository, it's recommended to remove the image from the source # repository's container registry, so that the image from the main # repository's registry will be used there as well. -# -# The format of the tag is "%Y-%m-%d-${counter}" where ${counter} stays -# at "01" unless you have multiple updates on the same day :) variables: - UBUNTU_TAG: 2019-01-31-01 - UBUNTU_IMAGE: "$CI_REGISTRY/$CI_PROJECT_PATH/ubuntu:$UBUNTU_TAG" + UPSTREAM_REPO: mesa/mesa + DEBIAN_TAG: "2019-07-04" + DEBIAN_VERSION: stretch-slim + DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG" +include: + - project: 'wayland/ci-templates' + ref: c73dae8b84697ef18e2dbbf4fed7386d9652b0cd + file: '/templates/debian.yml' stages: - containers-build - build+test +# When to automatically run the CI +.ci-run-policy: &ci-run-policy + only: + - branches@mesa/mesa + - merge_requests + - /^ci([-/].*)?$/ + retry: + max: 2 + when: + - runner_system_failure + + # CONTAINERS -containers:ubuntu: +debian: + extends: .debian@container-ifnot-exists stage: containers-build - image: docker:stable - services: - - docker:dind + <<: *ci-run-policy variables: - DOCKER_HOST: tcp://docker:2375 - DOCKER_DRIVER: overlay2 - script: - # Enable experimental features such as `docker manifest inspect` - - mkdir -p ~/.docker - - "echo '{\"experimental\": \"enabled\"}' > ~/.docker/config.json" - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - # Check if the image (with the specific tag) already exists - - docker manifest inspect $UBUNTU_IMAGE && exit || true - - docker build -t $UBUNTU_IMAGE -f .gitlab-ci/Dockerfile.ubuntu . - - docker push $UBUNTU_IMAGE - only: - changes: - - .gitlab-ci.yml - - .gitlab-ci/Dockerfile.ubuntu + GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image + DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' # BUILD .build: - image: $UBUNTU_IMAGE + <<: *ci-run-policy + image: $DEBIAN_IMAGE stage: build+test + cache: + paths: + - ccache artifacts: when: on_failure untracked: true - -.meson-build: - extends: .build + variables: + CCACHE_COMPILERCHECK: "content" + # Use ccache transparently, and print stats before/after before_script: - # We need to control the version of llvm-config we're using, so we'll - # generate a native file to do so. This requires meson >=0.49 - - if test -n "$LLVM_VERSION"; then - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"; - echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file; - $LLVM_CONFIG --version; - else - touch native.file; - fi - - meson --version - - meson _build - --native-file=native.file - -D build-tests=true - -D libunwind=${UNWIND} - ${DRI_LOADERS} - -D dri-drivers=${DRI_DRIVERS:-[]} - ${GALLIUM_ST} - -D gallium-drivers=${GALLIUM_DRIVERS:-[]} - -D vulkan-drivers=${VULKAN_DRIVERS:-[]} - - cd _build - - meson configure - script: - - ninja - - ninja test + - export PATH="/usr/lib/ccache:$PATH" + - export CCACHE_BASEDIR="$PWD" + - export CCACHE_DIR="$PWD/ccache" + - ccache --zero-stats || true + - ccache --show-stats || true + after_script: + - export CCACHE_DIR="$PWD/ccache" + - ccache --show-stats -.make-build: +.meson-build: extends: .build - variables: - MAKEFLAGS: "-j4" - before_script: - - if test -n "$LLVM_VERSION"; then - export LLVM_CONFIG="llvm-config-${LLVM_VERSION}"; - fi - - mkdir build - - cd build - - ../autogen.sh - --enable-autotools - --enable-debug - $LIBUNWIND_FLAGS - $DRI_LOADERS - --with-dri-drivers=$DRI_DRIVERS - $GALLIUM_ST - --with-gallium-drivers=$GALLIUM_DRIVERS - --with-vulkan-drivers=$VULKAN_DRIVERS - --disable-llvm-shared-libs script: - - make - - eval $MAKE_CHECK_COMMAND + - .gitlab-ci/meson-build.sh .scons-build: extends: .build @@ -122,16 +92,23 @@ containers:ubuntu: - scons $SCONS_TARGET - eval $SCONS_CHECK_COMMAND -build:meson-vulkan: +# 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. +# +# We also put softpipe (and therefore gallium nine, which requires +# it) here, since softpipe/llvmpipe can't be built alongside classic +# swrast. +# +# Putting glvnd here is arbitrary, but we want it in one of the builds +# for coverage. +meson-swr-glvnd: extends: .meson-build variables: - UNWIND: "false" + UNWIND: "true" DRI_LOADERS: > - -D glx=disabled - -D gbm=false - -D egl=false - -D platforms=x11,wayland,drm - -D osmesa=none + -D glvnd=true + -D egl=true GALLIUM_ST: > -D dri3=true -D gallium-vdpau=false @@ -139,15 +116,44 @@ build:meson-vulkan: -D gallium-omx=disabled -D gallium-va=false -D gallium-xa=false - -D gallium-nine=false + -D gallium-nine=true -D gallium-opencl=disabled - VULKAN_DRIVERS: intel,amd - LLVM_VERSION: "7" + -D osmesa=gallium + GALLIUM_DRIVERS: "swr,swrast,iris" + LLVM_VERSION: "6.0" -build:meson-loader-classic-dri: +meson-clang: extends: .meson-build variables: - UNWIND: "false" + UNWIND: "true" + DRI_DRIVERS: "auto" + GALLIUM_DRIVERS: "auto" + VULKAN_DRIVERS: intel,amd,freedreno + CC: "ccache clang-8" + CXX: "ccache clang++-8" + 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 + +scons-swr: + extends: .scons-build + variables: + SCONS_TARGET: "swr=1" + SCONS_CHECK_COMMAND: "true" + LLVM_VERSION: "6.0" + +scons-win64: + extends: .scons-build + variables: + SCONS_TARGET: platform=windows machine=x86_64 + SCONS_CHECK_COMMAND: "true" + +meson-main: + extends: .meson-build + variables: + UNWIND: "true" DRI_LOADERS: > -D glx=dri -D gbm=true @@ -157,55 +163,81 @@ build:meson-loader-classic-dri: DRI_DRIVERS: "i915,i965,r100,r200,swrast,nouveau" GALLIUM_ST: > -D dri3=true + -D gallium-extra-hud=true + -D gallium-vdpau=true + -D gallium-xvmc=true + -D gallium-omx=bellagio + -D gallium-va=true + -D gallium-xa=true + -D gallium-nine=false + -D gallium-opencl=disabled + GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,svga,v3d,vc4,virgl,etnaviv,panfrost,lima" + LLVM_VERSION: "7" + EXTRA_OPTION: > + -D tools=all + +meson-clover: + extends: .meson-build + variables: + UNWIND: "true" + DRI_LOADERS: > + -D glx=disabled + -D egl=false + -D gbm=false + 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 gallium-opencl=disabled - -build:make-vulkan: - extends: .make-build + -D gallium-opencl=icd + script: + - export GALLIUM_DRIVERS="r600,radeonsi" + - .gitlab-ci/meson-build.sh + - LLVM_VERSION=7 .gitlab-ci/meson-build.sh + - export GALLIUM_DRIVERS="i915,r600" + - 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 + +meson-vulkan: + extends: .meson-build variables: - MAKE_CHECK_COMMAND: "make -C src/gtest check && make -C src/intel check" - LLVM_VERSION: "7" + UNWIND: "false" DRI_LOADERS: > - --disable-glx - --disable-gbm - --disable-egl - --with-platforms=x11,wayland,drm - DRI_DRIVERS: "" + -D glx=disabled + -D gbm=false + -D egl=false + -D platforms=x11,wayland,drm + -D osmesa=none GALLIUM_ST: > - --enable-dri - --enable-dri3 - --disable-opencl - --disable-xa - --disable-nine - --disable-xvmc - --disable-vdpau - --disable-va - --disable-omx-bellagio - --disable-gallium-osmesa - VULKAN_DRIVERS: intel,radeon - LIBUNWIND_FLAGS: --disable-libunwind - -build:scons-nollvm: + -D dri3=true + -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 gallium-opencl=disabled + VULKAN_DRIVERS: intel,amd,freedreno + LLVM_VERSION: "7" + EXTRA_OPTION: > + -D vulkan-overlay-layer=true + +scons-nollvm: extends: .scons-build variables: SCONS_TARGET: "llvm=0" SCONS_CHECK_COMMAND: "scons llvm=0 check" -build:scons-llvm: +scons-llvm: extends: .scons-build variables: SCONS_TARGET: "llvm=1" SCONS_CHECK_COMMAND: "scons llvm=1 check" - LLVM_VERSION: "3.9" - -build:scons-swr: - extends: .scons-build - variables: - SCONS_TARGET: "swr=1" - SCONS_CHECK_COMMAND: "true" - LLVM_VERSION: "6.0" + LLVM_VERSION: "3.4" + # LLVM 3.4 packages were built with an old libstdc++ ABI + CXX: "g++ -D_GLIBCXX_USE_CXX11_ABI=0"