gitlab-ci: drop most autotools builds

With autotools this close to being not supported anymore, let's not
waste half of the CI cycles on it. The default build will catch most
issues, and the rest can be tested by the old Travis.

Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>

1 files changed, 13 insertions, 162 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87f6c19f31b..28840e055a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,29 +112,6 @@ ubuntu:
     - ninja -j4
     - ninja test
 
-.make-build:
-  extends: .build
-  variables:
-    MAKEFLAGS: "-j4"
-  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
-    - make
-    - eval $MAKE_CHECK_COMMAND
-
 .scons-build:
   extends: .build
   variables:
@@ -326,146 +303,20 @@ meson-gallium-st-other:
     GALLIUM_DRIVERS: "nouveau,swrast"
     LLVM_VERSION: "5.0"
 
-make-vulkan:
-  extends: .make-build
-  variables:
-    MAKE_CHECK_COMMAND: "make -C src/gtest check && make -C src/intel check"
-    LLVM_VERSION: "7"
-    DRI_LOADERS: >
-      --disable-glx
-      --disable-gbm
-      --disable-egl
-      --with-platforms=x11,wayland,drm
-    DRI_DRIVERS: ""
-    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
-
-make-loader-classic-dri:
-  extends: .make-build
-  variables:
-    MAKE_CHECK_COMMAND: "make check"
-    DRI_LOADERS: >
-      --enable-glx
-      --enable-gbm
-      --enable-egl
-      --with-platforms=x11,wayland,drm,surfaceless
-      --enable-osmesa
-    DRI_DRIVERS: "i915,i965,radeon,r200,swrast,nouveau"
-    GALLIUM_ST: >
-      --enable-dri
-      --disable-opencl
-      --disable-xa
-      --disable-nine
-      --disable-xvmc
-      --disable-vdpau
-      --disable-va
-      --disable-omx-bellagio
-      --disable-gallium-osmesa
-    LIBUNWIND_FLAGS: --disable-libunwind
-
-# 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.
-make-gallium-drivers-swr:
-  extends: .make-build
-  variables:
-    MAKE_CHECK_COMMAND: "true"
-    LLVM_VERSION: "6.0"
-    DRI_LOADERS: >
-      --disable-glx
-      --disable-gbm
-      --disable-egl
-    GALLIUM_ST: >
-      --enable-dri
-      --disable-opencl
-      --disable-xa
-      --disable-nine
-      --disable-xvmc
-      --disable-vdpau
-      --disable-va
-      --disable-omx-bellagio
-      --disable-gallium-osmesa
-    GALLIUM_DRIVERS: "swr"
-    LIBUNWIND_FLAGS: --enable-libunwind
-
-make-gallium-drivers-radeonsi:
-  extends: make-gallium-drivers-swr
-  variables:
-    LLVM_VERSION: "7"
-    GALLIUM_DRIVERS: "radeonsi"
-
-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"
-
-make-gallium-st-clover-llvm:
-  extends: .make-build
-  variables:
-    MAKE_CHECK_COMMAND: "true"
-    DRI_LOADERS: >
-      --disable-glx
-      --disable-gbm
-      --disable-egl
-    GALLIUM_ST: >
-      --disable-dri
-      --enable-opencl
-      --enable-opencl-icd
-      --enable-llvm
-      --disable-xa
-      --disable-nine
-      --disable-xvmc
-      --disable-vdpau
-      --disable-va
-      --disable-omx-bellagio
-      --disable-gallium-osmesa
-    LIBUNWIND_FLAGS: --enable-libunwind
-    GALLIUM_DRIVERS: "r600,radeonsi"
-    LLVM_VERSION: "7"
-
-make-gallium-st-clover-llvm-39:
-  extends: make-gallium-st-clover-llvm
-  variables:
-    LLVM_VERSION: "3.9"
-    GALLIUM_DRIVERS: "r600"
-
-make-gallium-st-other:
-  extends: .make-build
+autotools:
+  extends: .build
   variables:
-    MAKE_CHECK_COMMAND: "true"
-    # We should be testing 3.3, but 3.9 is the oldest that still exists in ubuntu
-    LLVM_VERSION: "3.9"
-    DRI_LOADERS: >
-      --disable-glx
-      --disable-gbm
-      --disable-egl
-    GALLIUM_ST: >
-      --enable-dri
-      --disable-opencl
-      --enable-xa
-      --enable-nine
-      --enable-xvmc
-      --enable-vdpau
-      --enable-va
-      --enable-omx-bellagio
-      --enable-gallium-osmesa
-    # We need swrast for osmesa and nine.
-    # i915 most likely doesn't work with most ST.
-    # Regardless - we're doing a quick build test here.
-    GALLIUM_DRIVERS: "i915,swrast"
-    LIBUNWIND_FLAGS: --enable-libunwind
+    MAKEFLAGS: "-j4"
+    LLVM_CONFIG: llvm-config-7
+  script:
+    - mkdir build
+    - cd build
+    - ../autogen.sh
+        --enable-autotools
+        --enable-debug
+        --disable-llvm-shared-libs
+    - make
+    - make check
 
 scons-nollvm:
   extends: .scons-build