From a988d953899c099719f36093114516ccee652d28 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 8 Apr 2019 13:37:31 -0700 Subject: [PATCH] ci: Delete autotools build jobs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Eric Anholt Reviewed-by: Eric Engestrom Acked-by: Marek Olšák Acked-by: Jason Ekstrand Acked-by: Bas Nieuwenhuizen Acked-by: Matt Turner --- .gitlab-ci.yml | 15 --- .travis.yml | 395 ++++----------------------------------------------------- 2 files changed, 22 insertions(+), 388 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ca5703..e3aa2a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -117,21 +117,6 @@ ubuntu: - 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 - --disable-llvm-shared-libs - - make - - make check - # 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. diff --git a/.travis.yml b/.travis.yml index 82c2088..18f114b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,331 +32,6 @@ env: matrix: include: - env: - - LABEL="make Vulkan" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" - - LLVM_VERSION=7 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" - - 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" - - GALLIUM_DRIVERS="" - - VULKAN_DRIVERS="intel,radeon" - - LIBUNWIND_FLAGS="--disable-libunwind" - addons: - apt: - sources: - - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' - key_url: https://apt.llvm.org/llvm-snapshot.gpg.key - packages: - # From sources above - - llvm-7-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - python3-pip - - python3-setuptools - - env: - - LABEL="make loaders/classic DRI" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="make check" - - DRI_LOADERS="--enable-glx --enable-gbm --enable-egl --with-platforms=x11,drm,surfaceless,wayland --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" - - GALLIUM_DRIVERS="" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--disable-libunwind" - addons: - apt: - packages: - - xz-utils - - x11proto-xf86vidmode-dev - - libxxf86vm-dev - - libexpat1-dev - - libx11-xcb-dev - - libxdamage-dev - - libxfixes-dev - - python3-pip - - python3-setuptools - - env: - # 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. - - LABEL="make Gallium Drivers SWR" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=6.0 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - 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" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - packages: - - llvm-6.0-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - - LABEL="make Gallium Drivers RadeonSI" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=7 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="radeonsi" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - sources: - - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' - key_url: https://apt.llvm.org/llvm-snapshot.gpg.key - packages: - # From sources above - - llvm-7-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - - LABEL="make Gallium Drivers Other" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=3.9 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev - - llvm-3.9-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - - LABEL="make Gallium ST Clover LLVM-3.9" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=3.9 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - 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" - - GALLIUM_DRIVERS="r600" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - packages: - - libclc-dev - # LLVM packaging is broken and misses these dependencies - - libedit-dev - - llvm-3.9-dev - - clang-3.9 - - libclang-3.9-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - - LABEL="make Gallium ST Clover LLVM-4.0" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=4.0 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - 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" - - GALLIUM_DRIVERS="r600" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - packages: - - libclc-dev - # LLVM packaging is broken and misses these dependencies - - libedit-dev - - llvm-4.0-dev - - clang-4.0 - - libclang-4.0-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - - LABEL="make Gallium ST Clover LLVM-5.0" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=5.0 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - 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" - - GALLIUM_DRIVERS="r600" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - packages: - - libclc-dev - # LLVM packaging is broken and misses these dependencies - - libedit-dev - - llvm-5.0-dev - - clang-5.0 - - libclang-5.0-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - - LABEL="make Gallium ST Clover LLVM-6.0" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=6.0 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - 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" - - GALLIUM_DRIVERS="r600" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - packages: - - libclc-dev - - llvm-6.0-dev - - clang-6.0 - - libclang-6.0-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - - LABEL="make Gallium ST Clover LLVM-7" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=7 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - 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" - - GALLIUM_DRIVERS="r600,radeonsi" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - sources: - - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' - key_url: https://apt.llvm.org/llvm-snapshot.gpg.key - packages: - - libclc-dev - # From sources above - - llvm-7-dev - - clang-7 - - libclang-7-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - env: - - LABEL="make Gallium ST Other" - - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=3.5 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - - DRI_DRIVERS="" - - 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" - - VULKAN_DRIVERS="" - - LIBUNWIND_FLAGS="--enable-libunwind" - addons: - apt: - packages: - # We actually want to test against llvm-3.3, yet 3.5 is available - - llvm-3.5-dev - # Nine requires gcc 4.6... which is the one we have right ? - - libxvmc-dev - # Build locally, for now. - #- libvdpau-dev - #- libva-dev - - libomxil-bellagio-dev - # LLVM packaging is broken and misses these dependencies - - libedit-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3-pip - - python3-setuptools - - env: - - LABEL="macOS make" - - BUILD=make - - DRI_LOADERS="--with-platforms=x11 --disable-egl" - os: osx - - env: - LABEL="macOS meson" - BUILD=meson - DRI_LOADERS="-Dplatforms=x11" @@ -394,11 +69,6 @@ install: pip3 install --user mako; fi - # Install autotools build dependencies - - if test "x$BUILD" = xmake; then - pip2 install --user mako; - fi - # Install dependencies where we require specific versions (or where # disallowed by Travis CI's package whitelisting). @@ -502,48 +172,27 @@ install: fi script: - - if test "x$BUILD" = xmake; then - export CFLAGS="$CFLAGS -isystem`pwd`"; - export MAKEFLAGS="-j4"; - - 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; + if test "x$BUILD" = xmeson; then + if test -n "$LLVM_CONFIG"; then + # 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 + # + echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file + + $LLVM_CONFIG --version + else + : > native.file fi - - | - if test "x$BUILD" = xmeson; then - if test -n "$LLVM_CONFIG"; then - # 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 - # - echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file - - $LLVM_CONFIG --version - else - : > native.file - fi - - export CFLAGS="$CFLAGS -isystem`pwd`" - meson _build \ - --native-file=native.file \ - -Dbuild-tests=true \ - ${DRI_LOADERS} \ - -Ddri-drivers=${DRI_DRIVERS:-[]} \ - -Dgallium-drivers=${GALLIUM_DRIVERS:-[]} \ - -Dvulkan-drivers=${VULKAN_DRIVERS:-[]} - meson configure _build - ninja -C _build - ninja -C _build test - fi + export CFLAGS="$CFLAGS -isystem`pwd`" + meson _build \ + --native-file=native.file \ + -Dbuild-tests=true \ + ${DRI_LOADERS} \ + -Ddri-drivers=${DRI_DRIVERS:-[]} \ + -Dgallium-drivers=${GALLIUM_DRIVERS:-[]} \ + -Dvulkan-drivers=${VULKAN_DRIVERS:-[]} + meson configure _build + ninja -C _build + ninja -C _build test + fi -- 2.7.4