X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=014e06b29dcb8978fa1a561621b9e4012a458100;hb=16d108b502370b31cad7438a3e53b25554840f47;hp=f0e16cf1c28ace1873d59b8b428e2217fb59a79a;hpb=d6c55f6c62d9907f13aa21b5b07ce25430b669ee;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0e16cf1c28..014e06b29dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,19 +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_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:
@@ -49,24 +61,32 @@ containers:ubuntu:
       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
@@ -88,15 +108,14 @@ containers:ubuntu:
             -D vulkan-drivers=${VULKAN_DRIVERS:-[]}
     - cd _build
     - meson configure
-  script:
-    - ninja
+    - ninja -j4
     - ninja test
 
 .make-build:
   extends: .build
   variables:
     MAKEFLAGS: "-j4"
-  before_script:
+  script:
     - if test -n "$LLVM_VERSION"; then
         export LLVM_CONFIG="llvm-config-${LLVM_VERSION}";
       fi
@@ -112,7 +131,6 @@ containers:ubuntu:
         --with-gallium-drivers=$GALLIUM_DRIVERS
         --with-vulkan-drivers=$VULKAN_DRIVERS
         --disable-llvm-shared-libs
-  script:
     - make
     - eval $MAKE_CHECK_COMMAND
 
@@ -127,7 +145,7 @@ containers:ubuntu:
     - scons $SCONS_TARGET
     - eval $SCONS_CHECK_COMMAND
 
-build:meson-vulkan:
+meson-vulkan:
   extends: .meson-build
   variables:
     UNWIND: "false"
@@ -149,7 +167,7 @@ build:meson-vulkan:
     VULKAN_DRIVERS: intel,amd
     LLVM_VERSION: "7"
 
-build:meson-loader-classic-dri:
+meson-loader-classic-dri:
   extends: .meson-build
   variables:
     UNWIND: "false"
@@ -170,7 +188,7 @@ build:meson-loader-classic-dri:
       -D gallium-nine=false
       -D gallium-opencl=disabled
 
-build:meson-glvnd:
+meson-glvnd:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -192,7 +210,7 @@ build:meson-glvnd:
 # 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-gallium-swr:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -212,7 +230,7 @@ build:meson-gallium-swr:
     GALLIUM_DRIVERS: "swr"
     LLVM_VERSION: "6.0"
 
-build:meson-gallium-radeonsi:
+meson-gallium-radeonsi:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -232,7 +250,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"
@@ -249,10 +267,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"
@@ -269,21 +287,15 @@ build:meson-gallium-clover-llvm5:
       -D gallium-xa=false
       -D gallium-nine=false
       -D gallium-opencl=icd
-    GALLIUM_DRIVERS: "r600"
-    LLVM_VERSION: "5.0"
-
-build:meson-gallium-clover-llvm6:
-  extends: build:meson-gallium-clover-llvm5
-  variables:
-    LLVM_VERSION: "6.0"
+    GALLIUM_DRIVERS: "r600,radeonsi"
 
-build:meson-gallium-clover-llvm7:
-  extends: build:meson-gallium-clover-llvm5
+meson-gallium-clover-llvm39:
+  extends: meson-gallium-clover-llvm
   variables:
-    GALLIUM_DRIVERS: "r600,radeonsi"
-    LLVM_VERSION: "7"
+    GALLIUM_DRIVERS: "r600"
+    LLVM_VERSION: "3.9"
 
-build:meson-gallium-st-other:
+meson-gallium-st-other:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -304,7 +316,7 @@ build:meson-gallium-st-other:
     GALLIUM_DRIVERS: "nouveau,swrast"
     LLVM_VERSION: "5.0"
 
-build:make-vulkan:
+make-vulkan:
   extends: .make-build
   variables:
     MAKE_CHECK_COMMAND: "make -C src/gtest check && make -C src/intel check"
@@ -329,7 +341,7 @@ build:make-vulkan:
     VULKAN_DRIVERS: intel,radeon
     LIBUNWIND_FLAGS: --disable-libunwind
 
-build:make-loader-classic-dri:
+make-loader-classic-dri:
   extends: .make-build
   variables:
     MAKE_CHECK_COMMAND: "make check"
@@ -355,7 +367,7 @@ build:make-loader-classic-dri:
 # 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:make-gallium-drivers-swr:
+make-gallium-drivers-swr:
   extends: .make-build
   variables:
     MAKE_CHECK_COMMAND: "true"
@@ -377,23 +389,22 @@ build:make-gallium-drivers-swr:
     GALLIUM_DRIVERS: "swr"
     LIBUNWIND_FLAGS: --enable-libunwind
 
-build:make-gallium-drivers-radeonsi:
-  extends: build:make-gallium-drivers-swr
+make-gallium-drivers-radeonsi:
+  extends: make-gallium-drivers-swr
   variables:
     LLVM_VERSION: "7"
     GALLIUM_DRIVERS: "radeonsi"
 
-build:make-gallium-drivers-other:
-  extends: build:make-gallium-drivers-swr
+make-gallium-drivers-other:
+  extends: make-gallium-drivers-swr
   variables:
     LLVM_VERSION: "3.9"
     GALLIUM_DRIVERS: "i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv"
 
-build:make-gallium-st-clover-llvm-39:
+make-gallium-st-clover-llvm:
   extends: .make-build
   variables:
     MAKE_CHECK_COMMAND: "true"
-    LLVM_VERSION: "3.9"
     DRI_LOADERS: >
       --disable-glx
       --disable-gbm
@@ -410,31 +421,17 @@ build:make-gallium-st-clover-llvm-39:
       --disable-va
       --disable-omx-bellagio
       --disable-gallium-osmesa
-    GALLIUM_DRIVERS: "r600"
     LIBUNWIND_FLAGS: --enable-libunwind
+    GALLIUM_DRIVERS: "r600,radeonsi"
+    LLVM_VERSION: "7"
 
-build:make-gallium-st-clover-llvm-4:
-  extends: build:make-gallium-st-clover-llvm-39
-  variables:
-    LLVM_VERSION: "4.0"
-
-build:make-gallium-st-clover-llvm-5:
-  extends: build:make-gallium-st-clover-llvm-39
-  variables:
-    LLVM_VERSION: "5.0"
-
-build:make-gallium-st-clover-llvm-6:
-  extends: build:make-gallium-st-clover-llvm-39
-  variables:
-    LLVM_VERSION: "6.0"
-
-build:make-gallium-st-clover-llvm-7:
-  extends: build:make-gallium-st-clover-llvm-39
+make-gallium-st-clover-llvm-39:
+  extends: make-gallium-st-clover-llvm
   variables:
-    LLVM_VERSION: "7"
-    GALLIUM_DRIVERS: "r600,radeonsi"
+    LLVM_VERSION: "3.9"
+    GALLIUM_DRIVERS: "r600"
 
-build:make-gallium-st-other:
+make-gallium-st-other:
   extends: .make-build
   variables:
     MAKE_CHECK_COMMAND: "true"
@@ -460,20 +457,20 @@ build:make-gallium-st-other:
     GALLIUM_DRIVERS: "i915,swrast"
     LIBUNWIND_FLAGS: --enable-libunwind
 
-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"