From b40e0c11fdba50c2aa2a87f45eb522afae51aea7 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 14 Feb 2021 17:20:27 -0300 Subject: Remove some CI garbage --- .gitlab-ci.yml | 28 ++++++++-------------------- tools/ci/jobs/clang39.sh | 18 ------------------ tools/ci/jobs/clang6.sh | 18 ------------------ 3 files changed, 8 insertions(+), 56 deletions(-) delete mode 100755 tools/ci/jobs/clang39.sh delete mode 100755 tools/ci/jobs/clang6.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52d82b1..5e9c6f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,13 +60,13 @@ gcc-8: stage: build script: - ./tools/ci/jobs/gcc8.sh --enable-werror - image: debian:unstable + image: debian:buster gcc-8-i386: stage: build script: - ./tools/ci/jobs/gcc8.sh --enable-werror - image: i386/debian:unstable + image: i386/debian:buster gcc-9: stage: build @@ -80,53 +80,41 @@ gcc-9-i386: - ./tools/ci/jobs/gcc9.sh --enable-werror image: i386/debian:unstable -.clang-6: - stage: build - script: - - ./tools/ci/jobs/clang6.sh --enable-werror - image: debian:unstable - -.clang-6-i386: - stage: build - script: - - ./tools/ci/jobs/clang6.sh --enable-werror - image: i386/debian:unstable - .clang-7: stage: build script: - ./tools/ci/jobs/clang7.sh --enable-werror - image: debian:unstable + image: debian:jessie .clang-7-i386: stage: build script: - ./tools/ci/jobs/clang7.sh --enable-werror - image: i386/debian:unstable + image: i386/debian:jessie .clang-8: stage: build script: - ./tools/ci/jobs/clang8.sh --enable-werror - image: debian:unstable + image: debian:stretch .clang-8-i386: stage: build script: - ./tools/ci/jobs/clang8.sh --enable-werror - image: i386/debian:unstable + image: i386/debian:stretch clang-10: stage: build script: - ./tools/ci/jobs/clang10.sh --enable-werror - image: debian:unstable + image: debian:buster clang-10-i386: stage: build script: - ./tools/ci/jobs/clang10.sh --enable-werror - image: i386/debian:unstable + image: i386/debian:buster # tests diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh deleted file mode 100755 index ba6c23e..0000000 --- a/tools/ci/jobs/clang39.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -export CC=clang-3.9 -export CXX=clang++-3.9 -export LOGFILE=gcc6.log - -source ./tools/ci/scripts/init.sh - -aptget_install clang-3.9 \ - git-core \ - make autoconf automake autopoint \ - libtool mariadb-client libmariadbclient-dev-compat libz-dev libpcre3-dev - -do_init -build_init - -run_configure $* -run_make diff --git a/tools/ci/jobs/clang6.sh b/tools/ci/jobs/clang6.sh deleted file mode 100755 index 8fdc908..0000000 --- a/tools/ci/jobs/clang6.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -export CC=clang-6.0 -export CXX=clang++-6.0 -export LOGFILE=clang6.log - -source ./tools/ci/scripts/init.sh - -aptget_install clang-6.0 \ - git-core \ - make autoconf automake autopoint \ - libtool libmysqlclient-dev libz-dev libpcre3-dev - -do_init -build_init - -run_configure $* -run_make -- cgit v1.2.3-60-g2f50