mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-06-10 19:22:20 +00:00
Drop clang 8, gcc 5 & 6 on ubuntu.
This commit is contained in:
Brenden Matthews
parent
7c7984a3bb
commit
89e3b05fb4
|
|
@ -41,12 +41,9 @@ before_script:
|
|||
$CI_REGISTRY_IMAGE/builder/$DISTRO-$COMPILER:$CI_COMMIT_SHA
|
||||
- docker push $CI_REGISTRY_IMAGE/builder/$DISTRO-$COMPILER:$CI_COMMIT_SHA
|
||||
|
||||
pull ubuntu clang-8: *pull_images
|
||||
pull ubuntu clang-9: *pull_images
|
||||
pull ubuntu clang-10: *pull_images
|
||||
pull ubuntu clang-11: *pull_images
|
||||
pull ubuntu gcc-5: *pull_images
|
||||
pull ubuntu gcc-6: *pull_images
|
||||
pull ubuntu gcc-7: *pull_images
|
||||
pull ubuntu gcc-8: *pull_images
|
||||
pull ubuntu gcc-9: *pull_images
|
||||
|
|
@ -158,12 +155,9 @@ builder centos7 base:
|
|||
docker push
|
||||
${CI_REGISTRY_IMAGE}/builder/$DISTRO-$COMPILER:$CI_COMMIT_REF_SLUG
|
||||
|
||||
builder ubuntu clang-8: *docker_builder
|
||||
builder ubuntu clang-9: *docker_builder
|
||||
builder ubuntu clang-10: *docker_builder
|
||||
builder ubuntu clang-11: *docker_builder
|
||||
builder ubuntu gcc-5: *docker_builder
|
||||
builder ubuntu gcc-6: *docker_builder
|
||||
builder ubuntu gcc-7: *docker_builder
|
||||
builder ubuntu gcc-8: *docker_builder
|
||||
builder ubuntu gcc-9: *docker_builder
|
||||
|
|
@ -224,15 +218,6 @@ builder centos7 clang-5: *docker_builder
|
|||
BUILD_LUA_CAIRO: "ON"
|
||||
BUILD_LUA_RSVG: "ON"
|
||||
|
||||
ubuntu clang-8:
|
||||
<<: *build_stages
|
||||
variables:
|
||||
<<: *build_variables
|
||||
DISTRO: ubuntu
|
||||
COMPILER: clang-8
|
||||
CC: clang-8
|
||||
CXX: clang++-8
|
||||
|
||||
ubuntu clang-9:
|
||||
<<: *build_stages
|
||||
variables:
|
||||
|
|
@ -260,24 +245,6 @@ ubuntu clang-11:
|
|||
CC: clang-11
|
||||
CXX: clang++-11
|
||||
|
||||
ubuntu gcc-5:
|
||||
<<: *build_stages
|
||||
variables:
|
||||
<<: *build_variables
|
||||
DISTRO: ubuntu
|
||||
COMPILER: gcc-5
|
||||
CC: gcc-5
|
||||
CXX: g++-5
|
||||
|
||||
ubuntu gcc-6:
|
||||
<<: *build_stages
|
||||
variables:
|
||||
<<: *build_variables
|
||||
DISTRO: ubuntu
|
||||
COMPILER: gcc-6
|
||||
CC: gcc-6
|
||||
CXX: g++-6
|
||||
|
||||
ubuntu gcc-7:
|
||||
<<: *build_stages
|
||||
variables:
|
||||
|
|
@ -575,15 +542,6 @@ centos7 clang-5:
|
|||
paths:
|
||||
- build/test-conky-coverage-html/
|
||||
|
||||
test ubuntu clang-8:
|
||||
<<: *test_stages
|
||||
<<: *test_run
|
||||
variables:
|
||||
DISTRO: ubuntu
|
||||
COMPILER: clang-8
|
||||
CC: clang-8
|
||||
CXX: clang++-8
|
||||
|
||||
test ubuntu clang-9:
|
||||
<<: *test_stages
|
||||
<<: *test_run
|
||||
|
|
@ -611,24 +569,6 @@ test ubuntu clang-11:
|
|||
CC: clang-11
|
||||
CXX: clang++-11
|
||||
|
||||
test ubuntu gcc-5:
|
||||
<<: *test_stages
|
||||
<<: *test_run
|
||||
variables:
|
||||
DISTRO: ubuntu
|
||||
COMPILER: gcc-5
|
||||
CC: gcc-5
|
||||
CXX: g++-5
|
||||
|
||||
test ubuntu gcc-6:
|
||||
<<: *test_stages
|
||||
<<: *test_run
|
||||
variables:
|
||||
DISTRO: ubuntu
|
||||
COMPILER: gcc-6
|
||||
CC: gcc-6
|
||||
CXX: g++-6
|
||||
|
||||
test ubuntu gcc-7:
|
||||
<<: *test_stages
|
||||
<<: *test_run
|
||||
|
|
@ -872,12 +812,9 @@ push fedora-33 base: *push_base_images
|
|||
$CI_REGISTRY_IMAGE/builder/$DISTRO-$COMPILER:latest
|
||||
- docker push $CI_REGISTRY_IMAGE/builder/$DISTRO-$COMPILER:latest
|
||||
|
||||
push ubuntu clang-8: *push_images
|
||||
push ubuntu clang-9: *push_images
|
||||
push ubuntu clang-10: *push_images
|
||||
push ubuntu clang-11: *push_images
|
||||
push ubuntu gcc-5: *push_images
|
||||
push ubuntu gcc-6: *push_images
|
||||
push ubuntu gcc-7: *push_images
|
||||
push ubuntu gcc-8: *push_images
|
||||
push ubuntu gcc-9: *push_images
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky
|
||||
FROM ${IMAGE}/builder/ubuntu-base:latest
|
||||
|
||||
RUN wget -q https://apt.llvm.org/llvm-snapshot.gpg.key \
|
||||
&& apt-key add llvm-snapshot.gpg.key \
|
||||
&& add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-8 main' \
|
||||
&& DEBIAN_FRONTEND=noninteractive \
|
||||
apt-get install -qy --no-install-recommends \
|
||||
clang-8 \
|
||||
lldb-8 \
|
||||
lld-8 \
|
||||
libc++-8-dev \
|
||||
libc++abi-8-dev \
|
||||
clang-tools-8 \
|
||||
clang-format-8 \
|
||||
clang-tidy-8 \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky
|
||||
FROM ${IMAGE}/builder/ubuntu-base:latest
|
||||
|
||||
RUN wget -q https://apt.llvm.org/llvm-snapshot.gpg.key \
|
||||
&& apt-key add llvm-snapshot.gpg.key \
|
||||
&& add-apt-repository ppa:ubuntu-toolchain-r/test \
|
||||
&& DEBIAN_FRONTEND=noninteractive \
|
||||
apt-get install -qy --no-install-recommends \
|
||||
g++-5 \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky
|
||||
FROM ${IMAGE}/builder/ubuntu-base:latest
|
||||
|
||||
RUN wget -q https://apt.llvm.org/llvm-snapshot.gpg.key \
|
||||
&& apt-key add llvm-snapshot.gpg.key \
|
||||
&& add-apt-repository ppa:ubuntu-toolchain-r/test \
|
||||
&& DEBIAN_FRONTEND=noninteractive \
|
||||
apt-get install -qy --no-install-recommends \
|
||||
g++-6 \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
Loading…
Reference in New Issue
Block a user