From 58afe047cd566fd58a2f8c9ca04ac4d76aa3e102 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 22 Oct 2018 02:16:22 +0200 Subject: Fix gitlab-ci script for clang-5.0 The package clang-5.0 has been removed from Debian unstable and testing (as buster will ship with 6.0 and 7), and is currently only available in stretch-backports. Signed-off-by: Haru --- .gitlab-ci.yml | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9a156298..fb038ea66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,14 +124,22 @@ zero-2018:clang-4.0: pre_re:clang-5.0: <<: *branch_exceptions - <<: *prerequisites + before_script: + - echo "Building $CI_BUILD_NAME" + - uname -a + - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list + - ./tools/ci/retry.sh apt-get update + - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0 + - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES + - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST + - ./tools/ci/travis.sh getplugins || true stage: secondary - image: debian:unstable + image: debian:stretch services: - - mariadb:10 + - mariadb:10.1 variables: <<: *base_vars - INSTALL_PACKAGES: clang-5.0 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot --disable-renewal @@ -139,14 +147,22 @@ pre_re:clang-5.0: re:clang-5.0: <<: *branch_exceptions - <<: *prerequisites + before_script: + - echo "Building $CI_BUILD_NAME" + - uname -a + - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list + - ./tools/ci/retry.sh apt-get update + - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0 + - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES + - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST + - ./tools/ci/travis.sh getplugins || true stage: secondary - image: debian:unstable + image: debian:stretch services: - - mariadb:10 + - mariadb:10.1 variables: <<: *base_vars - INSTALL_PACKAGES: clang-5.0 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot @@ -154,14 +170,22 @@ re:clang-5.0: zero-2018:clang-5.0: <<: *branch_exceptions - <<: *prerequisites + before_script: + - echo "Building $CI_BUILD_NAME" + - uname -a + - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list + - ./tools/ci/retry.sh apt-get update + - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0 + - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES + - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST + - ./tools/ci/travis.sh getplugins || true stage: clients - image: debian:unstable + image: debian:stretch services: - - mariadb:10 + - mariadb:10.1 variables: <<: *base_vars - INSTALL_PACKAGES: clang-5.0 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 -- cgit v1.2.3-70-g09d2