summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2020-12-03 18:11:00 +0100
committerMarge Bot <eric+marge@anholt.net>2020-12-05 09:56:09 +0000
commit42bc6db7e71c348594277af58975467c54eb2b19 (patch)
tree06e8c6afc4d6403247f22b217c2e54472c3f0cb0
parent0781d9825b31d55aa350dfe158a314eb663e9c5d (diff)
ci: Drop x86_build_old image
Currently not used for anything. v2: * Drop build script as well (Eric Anholt) Fixes: a3543adc2628 "clover: set LLVM min version to 8.0.1" Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7902>
-rw-r--r--.gitlab-ci.yml14
-rw-r--r--.gitlab-ci/container/x86_build_old.sh69
2 files changed, 0 insertions, 83 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd6e0b94430..33f89ca094f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -352,20 +352,6 @@ x86_test-vk:
variables:
MESA_IMAGE_TAG: &x86_test-vk "2020-11-06-deqp-version"
-# Debian 9 based x86 build image (old LLVM)
-x86_build_old:
- extends: x86_build-base
- variables:
- MESA_IMAGE_TAG: &x86_build_old "2020-12-02"
- FDO_DISTRIBUTION_VERSION: stretch-slim
-
-.use-x86_build_old:
- variables:
- TAG: *x86_build_old
- image: "$CI_REGISTRY_IMAGE/debian/x86_build_old:${TAG}-${MESA_TEMPLATES_COMMIT}"
- needs:
- - x86_build_old
-
# Debian 10 based ARM build image
arm_build:
extends:
diff --git a/.gitlab-ci/container/x86_build_old.sh b/.gitlab-ci/container/x86_build_old.sh
deleted file mode 100644
index 3343fbb2449..00000000000
--- a/.gitlab-ci/container/x86_build_old.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o xtrace
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get install -y \
- apt-transport-https \
- ca-certificates
-
-sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
-echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/sources.list.d/backports.list
-
-apt-get update
-
-# Use newer packages from backports by default
-cat >/etc/apt/preferences <<EOF
-Package: *
-Pin: release a=stretch-backports
-Pin-Priority: 500
-EOF
-
-apt-get dist-upgrade -y
-
-apt-get install -y --no-remove \
- bison \
- bzip2 \
- ccache \
- flex \
- g++ \
- gcc \
- git \
- libclang-3.9-dev \
- libclang-4.0-dev \
- libclang-5.0-dev \
- libclang-6.0-dev \
- libclang-7-dev \
- libclc-dev \
- libdrm-dev \
- libelf-dev \
- libepoxy-dev \
- libexpat1-dev \
- libpng-dev \
- libunwind-dev \
- llvm-3.9-dev \
- llvm-4.0-dev \
- llvm-5.0-dev \
- llvm-6.0-dev \
- llvm-7-dev \
- ninja-build \
- pkg-config \
- python-mako \
- python3-mako \
- python3-pip \
- python3-setuptools \
- python3-wheel \
- scons \
- xz-utils \
- zlib1g-dev
-
-# We need at least 0.52.0, which is not in stretch
-python3 -m pip install meson>=0.52
-
-. .gitlab-ci/container/container_pre_build.sh
-
-############### Uninstall unused packages
-
-. .gitlab-ci/container/container_post_build.sh