diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index b57c223c..b7323478 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -27,15 +27,18 @@ jobs: - name: "Debian Testing" runner: ubuntu-latest container: debiantesting - - name: "Fedora 36" - runner: ubuntu-latest - container: fedora36 - name: "Fedora 37" runner: ubuntu-latest container: fedora37 - - name: "OpenSUSE 15.0" + - name: "Fedora 38" runner: ubuntu-latest - container: opensuse1500 + container: fedora38 + - 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 diff --git a/docker-compose.yml b/docker-compose.yml index c168f450..228112aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,18 +16,10 @@ services: security_opt: - label=type:container_runtime_t tty: true - test-fedora36: + test-archlinux: build: context: . - dockerfile: test/docker/fedora36 - network_mode: "host" - security_opt: - - label=type:container_runtime_t - tty: true - test-fedora37: - build: - context: . - dockerfile: test/docker/fedora37 + dockerfile: test/docker/archlinux network_mode: "host" security_opt: - label=type:container_runtime_t @@ -48,6 +40,54 @@ services: security_opt: - label=type:container_runtime_t tty: true + test-debianstable: + build: + context: . + dockerfile: test/docker/debianstable + network_mode: "host" + security_opt: + - label=type:container_runtime_t + tty: true + test-debiantesting: + build: + context: . + dockerfile: test/docker/debiantesting + network_mode: "host" + security_opt: + - label=type:container_runtime_t + tty: true + test-fedora37: + build: + context: . + dockerfile: test/docker/fedora37 + network_mode: "host" + security_opt: + - label=type:container_runtime_t + tty: true + test-fedora38: + build: + context: . + dockerfile: test/docker/fedora38 + network_mode: "host" + security_opt: + - label=type:container_runtime_t + tty: true + test-opensuseleap: + build: + context: . + dockerfile: test/docker/opensuseleap + network_mode: "host" + security_opt: + - label=type:container_runtime_t + tty: true + test-opensusetumbleweed: + build: + context: . + dockerfile: test/docker/opensusetumbleweed + network_mode: "host" + security_opt: + - label=type:container_runtime_t + tty: true test-ubuntu1804: build: context: . @@ -72,35 +112,3 @@ services: security_opt: - label=type:container_runtime_t tty: true - test-debianstable: - build: - context: . - dockerfile: test/docker/debianstable - network_mode: "host" - security_opt: - - label=type:container_runtime_t - tty: true - test-debiantesting: - build: - context: . - dockerfile: test/docker/debiantesting - network_mode: "host" - security_opt: - - label=type:container_runtime_t - tty: true - test-opensuse1500: - build: - context: . - dockerfile: test/docker/opensuse1500 - network_mode: "host" - security_opt: - - label=type:container_runtime_t - tty: true - test-archlinux: - build: - context: . - dockerfile: test/docker/archlinux - 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 70bfc1cb..3fca8559 100644 --- a/test/docker/alpine-edge +++ b/test/docker/alpine-edge @@ -28,6 +28,7 @@ RUN make -j2 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 echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version; exit $FAILED"] +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"] diff --git a/test/docker/alpine-latest b/test/docker/alpine-latest index cb071cfe..26e41701 100644 --- a/test/docker/alpine-latest +++ b/test/docker/alpine-latest @@ -28,6 +28,7 @@ RUN make -j2 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"] +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"] diff --git a/test/docker/archlinux b/test/docker/archlinux index 5be9c8cd..a6a8b879 100644 --- a/test/docker/archlinux +++ b/test/docker/archlinux @@ -29,6 +29,7 @@ RUN make -j2 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"] +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"] diff --git a/test/docker/centos7 b/test/docker/centos7 index 510b8714..7a88b3a0 100644 --- a/test/docker/centos7 +++ b/test/docker/centos7 @@ -35,7 +35,7 @@ RUN make -j2 RUN make install # Setup tests -RUN make test -j2 || true WORKDIR /root/code/test/ +RUN make -j2 -CMD ["bash", "-c", "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 ; exit $FAILED"] diff --git a/test/docker/centos8 b/test/docker/centos8 index 95f9e8ac..afc45a50 100644 --- a/test/docker/centos8 +++ b/test/docker/centos8 @@ -33,7 +33,7 @@ RUN make -j2 RUN make install # Setup tests -RUN make test -j2 || true WORKDIR /root/code/test/ +RUN make -j2 -CMD ["bash", "-c", "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 ; exit $FAILED"] diff --git a/test/docker/debianstable b/test/docker/debianstable index 1c22ca32..faa12f83 100644 --- a/test/docker/debianstable +++ b/test/docker/debianstable @@ -36,6 +36,6 @@ RUN make install # Setup tests WORKDIR /root/code/test/ -RUN make +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"] diff --git a/test/docker/debiantesting b/test/docker/debiantesting index 7ef2d965..ff8c6476 100644 --- a/test/docker/debiantesting +++ b/test/docker/debiantesting @@ -38,6 +38,6 @@ RUN make install # Setup tests WORKDIR /root/code/test/ -RUN make +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"] diff --git a/test/docker/fedora37 b/test/docker/fedora37 index 1e749bfb..fc8fe763 100644 --- a/test/docker/fedora37 +++ b/test/docker/fedora37 @@ -28,6 +28,7 @@ RUN make -j2 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 ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version"] +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"] diff --git a/test/docker/fedora36 b/test/docker/fedora38 similarity index 73% rename from test/docker/fedora36 rename to test/docker/fedora38 index 12af318c..88b88ef0 100644 --- a/test/docker/fedora36 +++ b/test/docker/fedora38 @@ -1,4 +1,4 @@ -FROM fedora:36 +FROM fedora:38 RUN dnf update -y RUN dnf install -y \ @@ -28,6 +28,7 @@ RUN make -j2 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 ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version"] +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"] diff --git a/test/docker/gentoo b/test/docker/gentoo index a956c566..2eeacd84 100644 --- a/test/docker/gentoo +++ b/test/docker/gentoo @@ -33,6 +33,7 @@ RUN make -j2 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"] +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"] diff --git a/test/docker/opensuse1500 b/test/docker/opensuseleap similarity index 87% rename from test/docker/opensuse1500 rename to test/docker/opensuseleap index 46a8904f..cc0d9a3a 100644 --- a/test/docker/opensuse1500 +++ b/test/docker/opensuseleap @@ -1,4 +1,4 @@ -FROM opensuse/leap:15 +FROM opensuse/leap RUN zypper install -y \ cmake \ @@ -8,7 +8,7 @@ RUN zypper install -y \ make \ man \ python3 \ - python3-dateutil \ + python3-python-dateutil \ ruby RUN gem install asciidoctor -v 2.0.15 @@ -33,6 +33,6 @@ RUN make install # Setup tests WORKDIR /root/code/test/ -RUN make +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 ; exit $FAILED"] diff --git a/test/docker/opensusetumbleweed b/test/docker/opensusetumbleweed new file mode 100644 index 00000000..1de49467 --- /dev/null +++ b/test/docker/opensusetumbleweed @@ -0,0 +1,36 @@ +FROM opensuse/tumbleweed + +RUN zypper install -y \ + cmake \ + gcc-c++ \ + git \ + man \ + python3 \ + python3-python-dateutil \ + ruby + +RUN gem install asciidoctor -v 2.0.15 +RUN update-alternatives --install /usr/bin/asciidoctor asciidoctor /usr/bin/asciidoctor.ruby3.2 10 +RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10 +ENV TZ=Europe/Berlin + +# Setup environment +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"] diff --git a/test/docker/ubuntu1804 b/test/docker/ubuntu1804 index 46dc9c7b..dc6ad12c 100644 --- a/test/docker/ubuntu1804 +++ b/test/docker/ubuntu1804 @@ -36,6 +36,6 @@ RUN make install # Setup tests WORKDIR /root/code/test/ -RUN make +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"] diff --git a/test/docker/ubuntu2004 b/test/docker/ubuntu2004 index c60b4c96..a1564514 100644 --- a/test/docker/ubuntu2004 +++ b/test/docker/ubuntu2004 @@ -37,6 +37,6 @@ RUN make install # Setup tests WORKDIR /root/code/test/ -RUN make +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"] diff --git a/test/docker/ubuntu2204 b/test/docker/ubuntu2204 index 14aefe0f..e05a35a4 100644 --- a/test/docker/ubuntu2204 +++ b/test/docker/ubuntu2204 @@ -37,6 +37,6 @@ RUN make install # Setup tests WORKDIR /root/code/test/ -RUN make +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"]