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

Update test zoo

Browse source 
- Remove 'version' from docker-compose.yml
- Add Asciidoctor version to informative output
- Fix Asciidoctor install on OpenSUSE Tumbleweed
- Add Ubuntu 24.04 to test zoo
- Drop Ubuntu 18.04 from test zoo
- Add Fedora 40 to test zoo
- Add Fedora 41 to test zoo
- Drop Fedora 37 from test zoo
- Drop Fedora 38 from test zoo

Closes #648
This commit is contained in:
Thomas Lauf 2025-02-02 19:35:48 +01:00
parent c0b049f469
commit 77f66969c5
15 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/tests.yaml vendored
View file

@ -24,27 +24,27 @@ jobs:
- name: "Debian Testing" - name: "Debian Testing"
runner: ubuntu-latest runner: ubuntu-latest
container: debiantesting container: debiantesting
- name: "Fedora 37" - name: "Fedora 40"
runner: ubuntu-latest runner: ubuntu-latest
container: fedora37 container: fedora40
- name: "Fedora 38" - name: "Fedora 41"
runner: ubuntu-latest runner: ubuntu-latest
container: fedora38 container: fedora41
- name: "OpenSUSE Leap" - name: "OpenSUSE Leap"
runner: ubuntu-latest runner: ubuntu-latest
container: opensuseleap container: opensuseleap
- name: "OpenSUSE Tumbleweed" - name: "OpenSUSE Tumbleweed"
runner: ubuntu-latest runner: ubuntu-latest
container: opensusetumbleweed container: opensusetumbleweed
- name: "Ubuntu 18.04"
runner: ubuntu-latest
container: ubuntu1804
- name: "Ubuntu 20.04" - name: "Ubuntu 20.04"
runner: ubuntu-latest runner: ubuntu-latest
container: ubuntu2004 container: ubuntu2004
- name: "Ubuntu 22.04" - name: "Ubuntu 22.04"
runner: ubuntu-latest runner: ubuntu-latest
container: ubuntu2204 container: ubuntu2204
- name: "Ubuntu 24.04"
runner: ubuntu-latest
container: ubuntu2204
- name: "macOS 13" - name: "macOS 13"
runner: macos-13 runner: macos-13
container: osx-13 container: osx-13

25
docker-compose.yml
View file

@ -1,4 +1,3 @@
version: '3'
services: services:
test-alpine-edge: test-alpine-edge:
build: build:
@ -48,18 +47,18 @@ services:
security_opt: security_opt:
- label=type:container_runtime_t - label=type:container_runtime_t
tty: true tty: true
test-fedora37: test-fedora40:
build: build:
context: . context: .
dockerfile: test/docker/fedora37 dockerfile: test/docker/fedora40
network_mode: "host" network_mode: "host"
security_opt: security_opt:
- label=type:container_runtime_t - label=type:container_runtime_t
tty: true tty: true
test-fedora38: test-fedora41:
build: build:
context: . context: .
dockerfile: test/docker/fedora38 dockerfile: test/docker/fedora41
network_mode: "host" network_mode: "host"
security_opt: security_opt:
- label=type:container_runtime_t - label=type:container_runtime_t
@ -80,14 +79,6 @@ services:
security_opt: security_opt:
- label=type:container_runtime_t - label=type:container_runtime_t
tty: true tty: true
test-ubuntu1804:
build:
context: .
dockerfile: test/docker/ubuntu1804
network_mode: "host"
security_opt:
- label=type:container_runtime_t
tty: true
test-ubuntu2004: test-ubuntu2004:
build: build:
context: . context: .
@ -104,3 +95,11 @@ services:
security_opt: security_opt:
- label=type:container_runtime_t - label=type:container_runtime_t
tty: true tty: true
test-ubuntu2404:
build:
context: .
dockerfile: test/docker/ubuntu2404
network_mode: "host"
security_opt:
- label=type:container_runtime_t
tty: true

2
test/docker/alpine-edge
View file

@ -31,4 +31,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

2
test/docker/alpine-latest
View file

@ -31,4 +31,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

2
test/docker/archlinux
View file

@ -32,4 +32,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

2
test/docker/centos-stream9
View file

@ -36,4 +36,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

2
test/docker/debianstable
View file

@ -38,4 +38,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

2
test/docker/debiantesting
View file

@ -40,4 +40,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

4
test/docker/fedora37 → test/docker/fedora40
View file

@ -1,4 +1,4 @@
FROM fedora:37 FROM fedora:40
RUN dnf update -y RUN dnf update -y
RUN dnf install -y \ RUN dnf install -y \
@ -31,4 +31,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

4
test/docker/fedora38 → test/docker/fedora41
View file

@ -1,4 +1,4 @@
FROM fedora:38 FROM fedora:41
RUN dnf update -y RUN dnf update -y
RUN dnf install -y \ RUN dnf install -y \
@ -31,4 +31,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

2
test/docker/opensuseleap
View file

@ -35,4 +35,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

7
test/docker/opensusetumbleweed
View file

@ -7,10 +7,9 @@ RUN zypper install -y \
man \ man \
python3 \ python3 \
python3-python-dateutil \ python3-python-dateutil \
ruby ruby \
ruby3.4-rubygem-asciidoctor
RUN gem install asciidoctor -v 2.0.17
RUN update-alternatives --install /usr/bin/asciidoctor asciidoctor /usr/bin//asciidoctor.ruby3.3 10
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
ENV TZ=Europe/Berlin ENV TZ=Europe/Berlin
@ -33,4 +32,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

2
test/docker/ubuntu2004
View file

@ -39,4 +39,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

2
test/docker/ubuntu2204
View file

@ -39,4 +39,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]

5
test/docker/ubuntu1804 → test/docker/ubuntu2404
View file

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:24.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
@ -10,6 +10,7 @@ RUN apt-get install -y \
git \ git \
locales \ locales \
man \ man \
man-db \
python3 \ python3 \
python3-dateutil \ python3-dateutil \
tzdata tzdata
@ -38,4 +39,4 @@ RUN make install
WORKDIR /root/code/test/ WORKDIR /root/code/test/
RUN make -j2 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"] CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; asciidoctor --version ; exit $FAILED"]