mirror of
https://github.com/GothenburgBitFactory/timewarrior.git
synced 2025-06-26 10:54:28 +02:00
Jettison centos7 and centos8 in favor of centos-stream9
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:
parent
57c9926af9
commit
ba197c6198
4 changed files with 7 additions and 59 deletions
7
.github/workflows/tests.yaml
vendored
7
.github/workflows/tests.yaml
vendored
|
@ -15,12 +15,9 @@ jobs:
|
|||
- name: "Archlinux Base"
|
||||
runner: ubuntu-latest
|
||||
container: archlinux
|
||||
- name: "Centos 7"
|
||||
- name: "Centos Stream9"
|
||||
runner: ubuntu-latest
|
||||
container: centos7
|
||||
- name: "Centos 8"
|
||||
runner: ubuntu-latest
|
||||
container: centos8
|
||||
container: centos-stream9
|
||||
- name: "Debian Stable"
|
||||
runner: ubuntu-latest
|
||||
container: debianstable
|
||||
|
|
|
@ -24,18 +24,10 @@ services:
|
|||
security_opt:
|
||||
- label=type:container_runtime_t
|
||||
tty: true
|
||||
test-centos7:
|
||||
test-centos-stream9:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: test/docker/centos7
|
||||
network_mode: "host"
|
||||
security_opt:
|
||||
- label=type:container_runtime_t
|
||||
tty: true
|
||||
test-centos8:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: test/docker/centos8
|
||||
dockerfile: test/docker/centos-stream9
|
||||
network_mode: "host"
|
||||
security_opt:
|
||||
- label=type:container_runtime_t
|
||||
|
|
|
@ -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
|
|
@ -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"]
|
Loading…
Add table
Add a link
Reference in a new issue