mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-06-02 07:20:47 +00:00
Drop clang-7 w/ ubuntu.
This commit is contained in:
parent
d05c9499b5
commit
7c7984a3bb
|
@ -41,7 +41,6 @@ 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-7: *pull_images
|
||||
pull ubuntu clang-8: *pull_images
|
||||
pull ubuntu clang-9: *pull_images
|
||||
pull ubuntu clang-10: *pull_images
|
||||
|
@ -159,7 +158,6 @@ builder centos7 base:
|
|||
docker push
|
||||
${CI_REGISTRY_IMAGE}/builder/$DISTRO-$COMPILER:$CI_COMMIT_REF_SLUG
|
||||
|
||||
builder ubuntu clang-7: *docker_builder
|
||||
builder ubuntu clang-8: *docker_builder
|
||||
builder ubuntu clang-9: *docker_builder
|
||||
builder ubuntu clang-10: *docker_builder
|
||||
|
@ -226,15 +224,6 @@ builder centos7 clang-5: *docker_builder
|
|||
BUILD_LUA_CAIRO: "ON"
|
||||
BUILD_LUA_RSVG: "ON"
|
||||
|
||||
ubuntu clang-7:
|
||||
<<: *build_stages
|
||||
variables:
|
||||
<<: *build_variables
|
||||
DISTRO: ubuntu
|
||||
COMPILER: clang-7
|
||||
CC: clang-7
|
||||
CXX: clang++-7
|
||||
|
||||
ubuntu clang-8:
|
||||
<<: *build_stages
|
||||
variables:
|
||||
|
@ -556,9 +545,9 @@ centos7 clang-5:
|
|||
fi
|
||||
- make -j4
|
||||
- make -j4 test
|
||||
- if [ "$COMPILER" == "clang-7" ] ; then make -j4 test-conky-coverage-txt ; fi
|
||||
- if [ "$COMPILER" == "clang-7" ] ; then make -j4 test-conky-coverage-html ; fi
|
||||
- if [ "$COMPILER" == "clang-7" ] ; then lcov-summary test-conky-coverage-html.info.cleaned ; fi
|
||||
- if [ "$COMPILER" == "clang-11" ] ; then make -j4 test-conky-coverage-txt ; fi
|
||||
- if [ "$COMPILER" == "clang-11" ] ; then make -j4 test-conky-coverage-html ; fi
|
||||
- if [ "$COMPILER" == "clang-11" ] ; then lcov-summary test-conky-coverage-html.info.cleaned ; fi
|
||||
- make -j4
|
||||
- if [[ "$DISTRO" == "freebsd12" ]] ; then sudo make install ; else make install ; fi
|
||||
- conky -v
|
||||
|
@ -586,15 +575,6 @@ centos7 clang-5:
|
|||
paths:
|
||||
- build/test-conky-coverage-html/
|
||||
|
||||
test ubuntu clang-7:
|
||||
<<: *test_stages
|
||||
<<: *test_run
|
||||
variables:
|
||||
DISTRO: ubuntu
|
||||
COMPILER: clang-7
|
||||
CC: clang-7
|
||||
CXX: clang++-7
|
||||
|
||||
test ubuntu clang-8:
|
||||
<<: *test_stages
|
||||
<<: *test_run
|
||||
|
@ -892,7 +872,6 @@ 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-7: *push_images
|
||||
push ubuntu clang-8: *push_images
|
||||
push ubuntu clang-9: *push_images
|
||||
push ubuntu clang-10: *push_images
|
||||
|
|
|
@ -14,5 +14,9 @@ RUN wget -q https://apt.llvm.org/llvm-snapshot.gpg.key \
|
|||
clang-tools-11 \
|
||||
clang-format-11 \
|
||||
clang-tidy-11 \
|
||||
nodejs \
|
||||
npm \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& npm install -g lcov-summary \
|
||||
&& npm cache clean --force
|
||||
|
|
|
@ -1,21 +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-7 main' \
|
||||
&& DEBIAN_FRONTEND=noninteractive \
|
||||
apt-get install -qy --no-install-recommends \
|
||||
clang-7 \
|
||||
lldb-7 \
|
||||
lld-7 \
|
||||
libc++-7-dev \
|
||||
libc++abi-7-dev \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& wget https://deb.nodesource.com/setup_11.x -O npm.sh \
|
||||
&& bash npm.sh \
|
||||
&& rm npm.sh \
|
||||
&& apt-get install -y nodejs \
|
||||
&& npm install -g lcov-summary \
|
||||
&& npm cache clean --force
|
Loading…
Reference in New Issue
Block a user