From 53e39760ab09263618da36b15a600c7a363d7b50 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Sun, 6 Dec 2020 01:35:47 -0500 Subject: [PATCH] ci: Replace F28 and F29 with F31, F32 and F33 --- .travis.yml | 12 ++++++++---- docker-compose.yml | 16 ++++++++++++---- test/docker/{fedora28 => fedora31} | 4 ++-- test/docker/{fedora29 => fedora32} | 4 ++-- test/docker/fedora33 | 26 ++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 12 deletions(-) rename test/docker/{fedora28 => fedora31} (89%) rename test/docker/{fedora29 => fedora32} (89%) create mode 100644 test/docker/fedora33 diff --git a/.travis.yml b/.travis.yml index 0cc1790dc..e38412f7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,17 @@ matrix: os: linux env: CONTAINER=centos7 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=fedora28 + env: CONTAINER=fedora32 + services: docker + - name: "Fedora 33" + os: linux + env: CONTAINER=fedora33 services: docker - name: "Debian Stable" os: linux diff --git a/docker-compose.yml b/docker-compose.yml index 1fc4e8d61..f34950d21 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,18 +8,26 @@ services: security_opt: - label=type:container_runtime_t tty: true - 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 + tty: true + test-fedora33: + build: + context: . + dockerfile: test/docker/fedora33 network_mode: "host" security_opt: - label=type:container_runtime_t diff --git a/test/docker/fedora28 b/test/docker/fedora31 similarity index 89% rename from test/docker/fedora28 rename to test/docker/fedora31 index b8868533f..adf95bac6 100644 --- a/test/docker/fedora28 +++ b/test/docker/fedora31 @@ -1,7 +1,7 @@ -FROM fedora:28 +FROM fedora:31 RUN dnf update -y -RUN dnf install python3 git gcc gcc-c++ cmake make gnutls-devel libuuid-devel libfaketime -y +RUN dnf install python3 git gcc gcc-c++ cmake make gnutls-devel libuuid-devel libfaketime glibc-langpack-en -y # Setup language environment ENV LC_ALL en_US.UTF-8 diff --git a/test/docker/fedora29 b/test/docker/fedora32 similarity index 89% rename from test/docker/fedora29 rename to test/docker/fedora32 index aadef5a89..ed47f8b98 100644 --- a/test/docker/fedora29 +++ b/test/docker/fedora32 @@ -1,7 +1,7 @@ -FROM fedora:29 +FROM fedora:32 RUN dnf update -y -RUN dnf install python3 git gcc gcc-c++ cmake make gnutls-devel libuuid-devel libfaketime -y +RUN dnf install python3 git gcc gcc-c++ cmake make gnutls-devel libuuid-devel libfaketime glibc-langpack-en -y # Setup language environment ENV LC_ALL en_US.UTF-8 diff --git a/test/docker/fedora33 b/test/docker/fedora33 new file mode 100644 index 000000000..c666edd01 --- /dev/null +++ b/test/docker/fedora33 @@ -0,0 +1,26 @@ +FROM fedora:33 + +RUN dnf update -y +RUN dnf install python3 git gcc gcc-c++ cmake make gnutls-devel libuuid-devel libfaketime glibc-langpack-en -y + +# Setup language environment +ENV LC_ALL en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US.UTF-8 + +# Setup taskwarrior +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 +RUN task --version + +# Setup tests +WORKDIR /root/code/test/ +RUN make + +CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]