mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-25 12:10:03 +00:00
Retire CentOS 6.
This commit is contained in:
Brenden Matthews
parent
7226ade004
commit
d05c9499b5
@ -57,7 +57,6 @@ pull fedora-29 clang-7: *pull_images
|
||||
pull fedora-31 clang-8: *pull_images
|
||||
pull fedora-32 clang-10: *pull_images
|
||||
pull fedora-33 clang-11: *pull_images
|
||||
pull centos6 gcc-7: *pull_images
|
||||
pull centos7 gcc-7: *pull_images
|
||||
pull centos7 gcc-8: *pull_images
|
||||
pull centos7 clang-5: *pull_images
|
||||
@ -128,11 +127,6 @@ builder fedora-33 base:
|
||||
variables:
|
||||
DOCKER_BASE_IMAGE: fedora:33
|
||||
|
||||
builder centos6 base:
|
||||
<<: *docker_base_builder
|
||||
variables:
|
||||
DOCKER_BASE_IMAGE: centos:6
|
||||
|
||||
builder centos7 base:
|
||||
<<: *docker_base_builder
|
||||
variables:
|
||||
@ -181,7 +175,6 @@ builder fedora-29 clang-7: *docker_builder
|
||||
builder fedora-31 clang-8: *docker_builder
|
||||
builder fedora-32 clang-10: *docker_builder
|
||||
builder fedora-33 clang-11: *docker_builder
|
||||
builder centos6 gcc-7: *docker_builder
|
||||
builder centos7 gcc-7: *docker_builder
|
||||
builder centos7 gcc-8: *docker_builder
|
||||
builder centos7 clang-5: *docker_builder
|
||||
@ -382,27 +375,6 @@ fedora-33 clang-11:
|
||||
CXX: clang++
|
||||
BUILD_AUDACIOUS: "OFF"
|
||||
|
||||
centos6 gcc-7:
|
||||
<<: *build_stages
|
||||
variables:
|
||||
<<: *build_variables
|
||||
DISTRO: centos6
|
||||
COMPILER: gcc-7
|
||||
CC: gcc
|
||||
CXX: g++
|
||||
CMAKE: cmake3
|
||||
BUILD_AUDACIOUS: "OFF"
|
||||
BUILD_XMMS2: "OFF"
|
||||
BUILD_NVIDIA: "OFF"
|
||||
BUILD_JOURNAL: "OFF"
|
||||
BUILD_LUA_CAIRO: "OFF"
|
||||
BUILD_LUA_RSVG: "OFF"
|
||||
# required because centos6 separates tinfo from ncurses
|
||||
LINKER_FLAGS: "-ltinfo"
|
||||
before_script:
|
||||
- source /opt/rh/devtoolset-7/enable
|
||||
- echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
|
||||
|
||||
centos7 gcc-7:
|
||||
<<: *build_stages
|
||||
variables:
|
||||
@ -758,18 +730,6 @@ test fedora-33 clang-11:
|
||||
CC: clang
|
||||
CXX: clang++
|
||||
|
||||
test centos6 gcc-7:
|
||||
<<: *test_stages
|
||||
<<: *test_run
|
||||
variables:
|
||||
DISTRO: centos7
|
||||
COMPILER: gcc-7
|
||||
CC: gcc
|
||||
CXX: g++
|
||||
before_script:
|
||||
- source /opt/rh/devtoolset-7/enable
|
||||
- echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
|
||||
|
||||
test centos7 clang-5:
|
||||
<<: *test_stages
|
||||
<<: *test_run
|
||||
@ -907,7 +867,6 @@ check clang-format:
|
||||
- docker push $CI_REGISTRY_IMAGE/builder/$DISTRO-base:latest
|
||||
|
||||
push ubuntu base: *push_base_images
|
||||
push centos6 base: *push_base_images
|
||||
push centos7 base: *push_base_images
|
||||
push fedora-29 base: *push_base_images
|
||||
push fedora-31 base: *push_base_images
|
||||
@ -949,7 +908,6 @@ push fedora-29 clang-7: *push_images
|
||||
push fedora-31 clang-8: *push_images
|
||||
push fedora-32 clang-10: *push_images
|
||||
push fedora-33 clang-11: *push_images
|
||||
push centos6 gcc-7: *push_images
|
||||
push centos7 gcc-7: *push_images
|
||||
push centos7 gcc-8: *push_images
|
||||
push centos7 clang-5: *push_images
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
FROM centos:6
|
||||
|
||||
ENV SCCACHE_VER=0.2.8
|
||||
|
||||
RUN yum update -y -q \
|
||||
&& yum -y -q install \
|
||||
epel-release \
|
||||
centos-release-scl \
|
||||
&& yum -y -q install \
|
||||
cairo-devel \
|
||||
dbus-glib-devel \
|
||||
docbook2X \
|
||||
freetype-devel \
|
||||
gcc \
|
||||
git \
|
||||
imlib2-devel \
|
||||
lcov \
|
||||
libcurl-devel \
|
||||
libical-devel \
|
||||
libircclient-devel \
|
||||
libmicrohttpd-devel \
|
||||
librsvg2-devel \
|
||||
libX11-devel \
|
||||
libXdamage-devel \
|
||||
libXext-devel \
|
||||
libXft-devel \
|
||||
libXinerama-devel \
|
||||
libxml2-devel \
|
||||
make \
|
||||
man \
|
||||
mysql-devel \
|
||||
ncurses-devel \
|
||||
openssl-devel \
|
||||
patch \
|
||||
pulseaudio-libs-devel \
|
||||
readline-devel \
|
||||
&& curl -sL https://github.com/mozilla/sccache/releases/download/${SCCACHE_VER}/sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz -o sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
|
||||
&& tar xf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
|
||||
&& cp sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl/sccache /usr/bin \
|
||||
&& rm -rf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl* \
|
||||
&& curl -L https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.sh -o cmake-3.13.4-Linux-x86_64.sh \
|
||||
&& chmod +x cmake-3.13.4-Linux-x86_64.sh \
|
||||
&& ./cmake-3.13.4-Linux-x86_64.sh --prefix=/usr --skip-license \
|
||||
&& rm cmake-3.13.4-Linux-x86_64.sh \
|
||||
&& mkdir /luabuild \
|
||||
&& pushd /luabuild \
|
||||
&& curl -R -O http://www.lua.org/ftp/lua-5.3.5.tar.gz \
|
||||
&& tar zxf lua-5.3.5.tar.gz \
|
||||
&& cd lua-5.3.5 \
|
||||
&& make -j4 linux MYCFLAGS=-fPIC MYLDFLAGS=-fPIC \
|
||||
&& make install INSTALL_TOP=/usr \
|
||||
&& popd \
|
||||
&& rm -rf /luabuild \
|
||||
&& mkdir -p /usr/lib/pkgconfig \
|
||||
&& echo $'\
|
||||
V= 5.3\n\
|
||||
R= 5.3.5\n\
|
||||
prefix= /usr\n\
|
||||
exec_prefix=${prefix}\n\
|
||||
libdir= /usr/lib\n\
|
||||
includedir=${prefix}/include\n\
|
||||
\n\
|
||||
Name: Lua\n\
|
||||
Description: An Extensible Extension Language\n\
|
||||
Version: ${R}\n\
|
||||
Requires:\n\
|
||||
Libs: -llua -lm -ldl\n\
|
||||
Cflags: -I${includedir}' \
|
||||
>> /usr/lib64/pkgconfig/lua.pc
|
||||
@ -1,6 +0,0 @@
|
||||
ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky
|
||||
FROM ${IMAGE}/builder/centos6-base:latest
|
||||
|
||||
RUN yum -y -q install \
|
||||
devtoolset-7 \
|
||||
&& yum clean all
|
||||
Loading…
Reference in New Issue
Block a user