Commit 17a77804 authored by jdgleaver's avatar jdgleaver
Browse files

Remove lcov, check from Dockerfile; transfer testing duties to new build...

Remove lcov, check from Dockerfile; transfer testing duties to new build container: Dockerfile.unit-test
parent 7a8c22e1
Pipeline #23769 failed with stage
in 9 minutes and 33 seconds
......@@ -13,6 +13,8 @@ docker-build-master:
- docker push "$CI_REGISTRY_IMAGE:dosbox-core"
- docker build --pull -t "$CI_REGISTRY_IMAGE:xenial-gcc9" --file Dockerfile.xenial-gcc9 .
- docker push "$CI_REGISTRY_IMAGE:xenial-gcc9"
- docker build --pull -t "$CI_REGISTRY_IMAGE:unit-test" --file Dockerfile.unit-test .
- docker push "$CI_REGISTRY_IMAGE:unit-test"
only:
- master
......@@ -31,5 +33,7 @@ docker-build:
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-dosbox-core"
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-xenial-gcc9" --file Dockerfile.xenial-gcc9 .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-xenial-gcc9"
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-unit-test" --file Dockerfile.unit-test .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-unit-test"
except:
- master
......@@ -77,8 +77,6 @@ RUN apt-get upgrade -y \
ccache \
nsis \
osslsigncode \
lcov \
check \
&& rm -rf /var/lib/apt/lists/*
RUN echo "###### Ubuntu Main Repos" > /etc/apt/sources.list && \
......
FROM git.libretro.com:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:latest
ENV DEBIAN_FRONTEND="noninteractive"
# Install lcov
RUN set -eux; \
apt-get update -y; \
apt-get -y install lcov; \
apt-get -y autoremove; \
apt-get -y clean; \
rm -rf /var/lib/apt/lists/*
# Install libcheck v0.15.2
RUN set -eux; \
wget -q 'https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz'; \
tar -xfz check-0.15.2.tar.gz; \
cd check-0.15.2; \
./configure; \
make; \
make install; \
cd -; \
rm check-0.15.2.tar.gz
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment