GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-06-26 10:54:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Jettison centos7 and centos8 in favor of centos-stream9

Browse source 
CentOS 8 reached end of life on 2021-12-31 (CentOS Stream8 on 2024-05-31)
CentOS 7 reaches end of life on 2024-06-30

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
This commit is contained in:
Thomas Lauf 2024-06-05 19:17:11 +02:00
parent 57c9926af9
commit ba197c6198
4 changed files with 7 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/docker/centos8 → test/docker/centos-stream9
View file

@ -1,6 +1,5 @@
FROM centos:centos8
FROM quay.io/centos/centos:stream9
RUN dnf -y --disablerepo '*' --enablerepo=extras swap centos-linux-repos centos-stream-repos
RUN dnf -y distro-sync
RUN dnf -y update
RUN dnf -y install \
@ -8,9 +7,10 @@ RUN dnf -y install \
cmake \
gcc-c++ \
git \
glibc-langpack-en.x86_64 \
make \
man \
python36 \
python3 \
python3-dateutil
RUN gem install asciidoctor

41
test/docker/centos7
View file

@ -1,41 +0,0 @@
FROM centos:7
RUN yum update -y
RUN yum install -y epel-release centos-release-scl
RUN yum install -y \
asciidoctor \
cmake3 \
devtoolset-7-gcc* \
gcc-c++ \
git \
make \
man \
python36 \
python36-dateutil
# Setup environment
RUN ln -sf /opt/rh/devtoolset-7/root/usr/bin/g++ /usr/bin/c++
RUN ln -sf /opt/rh/devtoolset-7/root/usr/bin/gcc /usr/bin/gcc
RUN ln -sf /opt/rh/devtoolset-7/root/usr/bin/g++ /usr/bin/g++
RUN ln -sf /usr/bin/cmake3 /usr/bin/cmake
RUN ln -sf /usr/bin/python3 /usr/bin/python
ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US.UTF-8
# Setup timewarrior
ADD . /root/code/
WORKDIR /root/code/
RUN git clean -dfx
RUN git submodule init
RUN git submodule update
RUN cmake -DCMAKE_BUILD_TYPE=debug .
RUN make -j2
RUN make install
# Setup tests
WORKDIR /root/code/test/
RUN make -j2
CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; exit $FAILED"]