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

Replace Fedora 28 and Fedora 29 by Fedora 31 and Fedora 32

Browse source 
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
This commit is contained in:
Thomas Lauf 2020-08-23 12:53:44 +02:00
parent 60c138b959
commit 1308a124bb
4 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -14,13 +14,13 @@ matrix:
os: linux
env: CONTAINER=centos8
services: docker
- name: "Fedora 28"
- name: "Fedora 31"
os: linux
env: CONTAINER=fedora28
env: CONTAINER=fedora31
services: docker
- name: "Fedora 29"
- name: "Fedora 32"
os: linux
env: CONTAINER=fedora29
env: CONTAINER=fedora32
services: docker
- name: "Debian Stable"
os: linux

8
docker-compose.yml
View file

@ -1,17 +1,17 @@
version: '3'
services:
test-fedora28:
test-fedora31:
build:
context: .
dockerfile: test/docker/fedora28
dockerfile: test/docker/fedora31
network_mode: "host"
security_opt:
- label=type:container_runtime_t
tty: true
test-fedora29:
test-fedora32:
build:
context: .
dockerfile: test/docker/fedora29
dockerfile: test/docker/fedora32
network_mode: "host"
security_opt:
- label=type:container_runtime_t

9
test/docker/fedora28 → test/docker/fedora31
View file

@ -1,9 +1,10 @@
FROM fedora:28
FROM fedora:31
RUN dnf update -y
RUN dnf install -y \
cmake \
gcc-c++ \
glibc-locale-source \
git \
make \
man \
@ -14,10 +15,6 @@ RUN dnf install -y \
RUN alternatives --install /usr/bin/python python /usr/bin/python3 10
RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
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/
@ -31,4 +28,4 @@ RUN make install
# Setup tests
RUN make -j2 test || true
WORKDIR /root/code/test/
CMD ["bash", "-c", "./problems --summary ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version; exit $FAILED"]
CMD ["bash", "-c", "./problems --summary ; cat all.log | grep 'not ok' ; ./problems ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version"]

9
test/docker/fedora29 → test/docker/fedora32
View file

@ -1,9 +1,10 @@
FROM fedora:29
FROM fedora:32
RUN dnf update -y
RUN dnf install -y \
cmake \
gcc-c++ \
glibc-locale-source \
git \
make \
man \
@ -14,10 +15,6 @@ RUN dnf install -y \
RUN alternatives --install /usr/bin/python python /usr/bin/python3 10
RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
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/
@ -31,4 +28,4 @@ RUN make install
# Setup tests
RUN make -j2 test || true
WORKDIR /root/code/test/
CMD ["bash", "-c", "./problems --summary ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version; exit $FAILED"]
CMD ["bash", "-c", "./problems --summary ; cat all.log | grep 'not ok' ; ./problems ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version"]