diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index f20df7a9..391fc2fc 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -24,27 +24,27 @@ jobs: - name: "Debian Testing" runner: ubuntu-latest container: debiantesting - - name: "Fedora 37" + - name: "Fedora 40" runner: ubuntu-latest - container: fedora37 - - name: "Fedora 38" + container: fedora40 + - name: "Fedora 41" runner: ubuntu-latest - container: fedora38 + container: fedora41 - name: "OpenSUSE Leap" runner: ubuntu-latest container: opensuseleap - name: "OpenSUSE Tumbleweed" runner: ubuntu-latest container: opensusetumbleweed - - name: "Ubuntu 18.04" - runner: ubuntu-latest - container: ubuntu1804 - name: "Ubuntu 20.04" runner: ubuntu-latest container: ubuntu2004 - name: "Ubuntu 22.04" runner: ubuntu-latest container: ubuntu2204 + - name: "Ubuntu 24.04" + runner: ubuntu-latest + container: ubuntu2204 - name: "macOS 13" runner: macos-13 container: osx-13 diff --git a/docker-compose.yml b/docker-compose.yml index e748fcfb..f4377def 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: test-alpine-edge: build: @@ -48,18 +47,18 @@ services: security_opt: - label=type:container_runtime_t tty: true - test-fedora37: + test-fedora40: build: context: . - dockerfile: test/docker/fedora37 + dockerfile: test/docker/fedora40 network_mode: "host" security_opt: - label=type:container_runtime_t tty: true - test-fedora38: + test-fedora41: build: context: . - dockerfile: test/docker/fedora38 + dockerfile: test/docker/fedora41 network_mode: "host" security_opt: - label=type:container_runtime_t @@ -80,14 +79,6 @@ services: security_opt: - label=type:container_runtime_t tty: true - test-ubuntu1804: - build: - context: . - dockerfile: test/docker/ubuntu1804 - network_mode: "host" - security_opt: - - label=type:container_runtime_t - tty: true test-ubuntu2004: build: context: . @@ -104,3 +95,11 @@ services: security_opt: - label=type:container_runtime_t tty: true + test-ubuntu2404: + build: + context: . + dockerfile: test/docker/ubuntu2404 + network_mode: "host" + security_opt: + - label=type:container_runtime_t + tty: true diff --git a/test/docker/alpine-edge b/test/docker/alpine-edge index 3fca8559..71f37ab8 100644 --- a/test/docker/alpine-edge +++ b/test/docker/alpine-edge @@ -31,4 +31,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/alpine-latest b/test/docker/alpine-latest index 26e41701..8faa8054 100644 --- a/test/docker/alpine-latest +++ b/test/docker/alpine-latest @@ -31,4 +31,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/archlinux b/test/docker/archlinux index a6a8b879..6e11670c 100644 --- a/test/docker/archlinux +++ b/test/docker/archlinux @@ -32,4 +32,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/centos-stream9 b/test/docker/centos-stream9 index 3d9a6e7e..f0c9ffee 100644 --- a/test/docker/centos-stream9 +++ b/test/docker/centos-stream9 @@ -36,4 +36,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/debianstable b/test/docker/debianstable index faa12f83..507e7ffc 100644 --- a/test/docker/debianstable +++ b/test/docker/debianstable @@ -38,4 +38,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/debiantesting b/test/docker/debiantesting index ff8c6476..043e086e 100644 --- a/test/docker/debiantesting +++ b/test/docker/debiantesting @@ -40,4 +40,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/fedora37 b/test/docker/fedora40 similarity index 88% rename from test/docker/fedora37 rename to test/docker/fedora40 index fc8fe763..3479e481 100644 --- a/test/docker/fedora37 +++ b/test/docker/fedora40 @@ -1,4 +1,4 @@ -FROM fedora:37 +FROM fedora:40 RUN dnf update -y RUN dnf install -y \ @@ -31,4 +31,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/fedora38 b/test/docker/fedora41 similarity index 88% rename from test/docker/fedora38 rename to test/docker/fedora41 index 88b88ef0..1f533b96 100644 --- a/test/docker/fedora38 +++ b/test/docker/fedora41 @@ -1,4 +1,4 @@ -FROM fedora:38 +FROM fedora:41 RUN dnf update -y RUN dnf install -y \ @@ -31,4 +31,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/opensuseleap b/test/docker/opensuseleap index 2dcedccb..97b8efe5 100644 --- a/test/docker/opensuseleap +++ b/test/docker/opensuseleap @@ -35,4 +35,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/opensusetumbleweed b/test/docker/opensusetumbleweed index b153380e..6a5c126f 100644 --- a/test/docker/opensusetumbleweed +++ b/test/docker/opensusetumbleweed @@ -7,10 +7,9 @@ RUN zypper install -y \ man \ python3 \ 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 ENV TZ=Europe/Berlin @@ -33,4 +32,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/ubuntu2004 b/test/docker/ubuntu2004 index a1564514..680df589 100644 --- a/test/docker/ubuntu2004 +++ b/test/docker/ubuntu2004 @@ -39,4 +39,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/ubuntu2204 b/test/docker/ubuntu2204 index e05a35a4..338194e9 100644 --- a/test/docker/ubuntu2204 +++ b/test/docker/ubuntu2204 @@ -39,4 +39,4 @@ RUN make install 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"] +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"] diff --git a/test/docker/ubuntu1804 b/test/docker/ubuntu2404 similarity index 88% rename from test/docker/ubuntu1804 rename to test/docker/ubuntu2404 index dc6ad12c..94ae594f 100644 --- a/test/docker/ubuntu1804 +++ b/test/docker/ubuntu2404 @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND noninteractive @@ -10,6 +10,7 @@ RUN apt-get install -y \ git \ locales \ man \ + man-db \ python3 \ python3-dateutil \ tzdata @@ -38,4 +39,4 @@ RUN make install 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"] +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"]