diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3a2fb00b1..ceae75125 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -9,9 +9,6 @@ jobs: - name: "Centos 8" runner: ubuntu-latest dockerfile: centos8 - - name: "Fedora 31" - runner: ubuntu-latest - dockerfile: fedora31 - name: "Fedora 32" runner: ubuntu-latest dockerfile: fedora32 diff --git a/docker-compose.yml b/docker-compose.yml index fe6fd7f4c..bd2d0240b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,14 +16,6 @@ services: security_opt: - label=type:container_runtime_t tty: true - test-fedora31: - build: - context: . - dockerfile: test/docker/fedora31 - network_mode: "host" - security_opt: - - label=type:container_runtime_t - tty: true test-fedora32: build: context: . diff --git a/test/docker/fedora31 b/test/docker/fedora31 deleted file mode 100644 index e8a511b9e..000000000 --- a/test/docker/fedora31 +++ /dev/null @@ -1,26 +0,0 @@ -FROM fedora:31 - -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 -j8 -RUN make install -RUN task --version - -# Setup tests -WORKDIR /root/code/test/ -RUN make -j8 - -CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]