X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=6ab6f6cc741389bef5a8b4780d3bbe81ea8ccfe4;hb=24037ff22820efe23946dae5a9f8afb419a9c1eb;hp=979cbadc7176950a2f98fa5997feff7ba0507d61;hpb=b5a70af062510b61bbd6d57fe26933ee3788e5be;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 979cbadc717..6ab6f6cc741 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,18 +16,31 @@ # 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" + UBUNTU_TAG: 2019-03-05-01 + UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu:$UBUNTU_TAG" + UBUNTU_IMAGE_MAIN: "registry.freedesktop.org/mesa/mesa/ubuntu:$UBUNTU_TAG" +cache: + paths: + - ccache stages: - containers-build - build+test +# When to automatically run the CI +.ci-run-policy: + only: + - master + - merge_requests + - /^ci([-/].*)?$/ + + # CONTAINERS -containers:ubuntu: +ubuntu: + extends: .ci-run-policy stage: containers-build image: docker:stable services: @@ -42,26 +55,38 @@ containers:ubuntu: - 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 + # Try to re-use the image from the main repository's registry + - docker image pull $UBUNTU_IMAGE_MAIN && + docker image tag $UBUNTU_IMAGE_MAIN $UBUNTU_IMAGE && + docker image push $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 # BUILD .build: + extends: .ci-run-policy image: $UBUNTU_IMAGE stage: build+test artifacts: when: on_failure untracked: true + # Use ccache transparently, and print stats before/after + before_script: + - export PATH="/usr/lib/ccache:$PATH" + - export CCACHE_BASEDIR="$PWD" + - export CCACHE_DIR="$PWD/ccache" + - export CCACHE_COMPILERCHECK=content + - ccache --zero-stats || true + - ccache --show-stats || true + after_script: + - export CCACHE_DIR="$PWD/ccache" + - ccache --show-stats .meson-build: extends: .build - before_script: + 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 @@ -81,48 +106,71 @@ containers:ubuntu: ${GALLIUM_ST} -D gallium-drivers=${GALLIUM_DRIVERS:-[]} -D vulkan-drivers=${VULKAN_DRIVERS:-[]} + -D I-love-half-baked-turnips=true - cd _build - meson configure - script: - - ninja + - ninja -j4 - ninja test -.make-build: +.scons-build: extends: .build variables: - MAKEFLAGS: "-j4" - before_script: + SCONSFLAGS: "-j4" + script: - if test -n "$LLVM_VERSION"; then export LLVM_CONFIG="llvm-config-${LLVM_VERSION}"; fi + - scons $SCONS_TARGET + - eval $SCONS_CHECK_COMMAND + +autotools: + extends: .build + variables: + MAKEFLAGS: "-j8" + LLVM_CONFIG: llvm-config-7 + script: - 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 + - make check -.scons-build: - extends: .build +# 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. +meson-gallium-swr: + extends: .meson-build 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 + 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 + GALLIUM_DRIVERS: "swr" + LLVM_VERSION: "6.0" -build:meson-vulkan: +meson-clang: + extends: .meson-build + variables: + UNWIND: "true" + DRI_DRIVERS: "auto" + GALLIUM_DRIVERS: "auto" + CC: clang-7 + CXX: clang++-7 + +meson-vulkan: extends: .meson-build variables: UNWIND: "false" @@ -141,10 +189,10 @@ build:meson-vulkan: -D gallium-xa=false -D gallium-nine=false -D gallium-opencl=disabled - VULKAN_DRIVERS: intel,amd + VULKAN_DRIVERS: intel,amd,freedreno LLVM_VERSION: "7" -build:meson-loader-classic-dri: +meson-loader-classic-dri: extends: .meson-build variables: UNWIND: "false" @@ -165,19 +213,17 @@ build:meson-loader-classic-dri: -D gallium-nine=false -D gallium-opencl=disabled -# NOTE: Building SWR is 2x (yes two) times slower than all the other -# gallium drivers combined. -# Start this early so that it doesn't hunder the run time. -build:meson-gallium-swr: +meson-glvnd: extends: .meson-build variables: UNWIND: "true" DRI_LOADERS: > - -D glx=disabled - -D egl=false - -D gbm=false + -D glvnd=true + -D egl=true + -D gbm=true + -D glx=dri + DRI_DRIVERS: "i965" GALLIUM_ST: > - -D dri3=false -D gallium-vdpau=false -D gallium-xvmc=false -D gallium-omx=disabled @@ -185,10 +231,8 @@ build:meson-gallium-swr: -D gallium-xa=false -D gallium-nine=false -D gallium-opencl=disabled - GALLIUM_DRIVERS: "swr" - LLVM_VERSION: "6.0" -build:meson-gallium-radeonsi: +meson-gallium-radeonsi: extends: .meson-build variables: UNWIND: "true" @@ -208,7 +252,7 @@ build:meson-gallium-radeonsi: GALLIUM_DRIVERS: "radeonsi" LLVM_VERSION: "7" -build:meson-gallium-drivers-other: +meson-gallium-drivers-other: extends: .meson-build variables: UNWIND: "true" @@ -225,10 +269,10 @@ build:meson-gallium-drivers-other: -D gallium-xa=false -D gallium-nine=false -D gallium-opencl=disabled - GALLIUM_DRIVERS: "i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv" + GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost" LLVM_VERSION: "5.0" -build:meson-gallium-clover-llvm5: +meson-gallium-clover-llvm: extends: .meson-build variables: UNWIND: "true" @@ -245,48 +289,49 @@ build:meson-gallium-clover-llvm5: -D gallium-xa=false -D gallium-nine=false -D gallium-opencl=icd + GALLIUM_DRIVERS: "r600,radeonsi" + +meson-gallium-clover-llvm39: + extends: meson-gallium-clover-llvm + variables: GALLIUM_DRIVERS: "r600" - LLVM_VERSION: "5.0" + LLVM_VERSION: "3.9" -build:make-vulkan: - extends: .make-build +meson-gallium-st-other: + extends: .meson-build variables: - MAKE_CHECK_COMMAND: "make -C src/gtest check && make -C src/intel check" - LLVM_VERSION: "7" + UNWIND: "true" DRI_LOADERS: > - --disable-glx - --disable-gbm - --disable-egl - --with-platforms=x11,wayland,drm - DRI_DRIVERS: "" + -D glx=disabled + -D egl=false + -D gbm=false 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 + -D dri3=true + -D gallium-vdpau=true + -D gallium-xvmc=true + -D gallium-omx=bellagio + -D gallium-va=true + -D gallium-xa=true + -D gallium-nine=true + -D gallium-opencl=disabled + -D osmesa=gallium + GALLIUM_DRIVERS: "nouveau,swrast" + LLVM_VERSION: "5.0" -build:scons-nollvm: +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: +scons-swr: extends: .scons-build variables: SCONS_TARGET: "swr=1"