diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d65fc7251..d853556fa 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -30,9 +30,6 @@ jobs: - name: "Ubuntu 20.04" runner: ubuntu-latest dockerfile: ubuntu2004 - - name: "Ubuntu 20.10" - runner: ubuntu-latest - dockerfile: ubuntu2010 - name: "Ubuntu 21.04" runner: ubuntu-latest dockerfile: ubuntu2104 diff --git a/docker-compose.yml b/docker-compose.yml index 1f2ed3d76..eafb2331d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -64,14 +64,6 @@ services: security_opt: - label=type:container_runtime_t tty: true - test-ubuntu2010: - build: - context: . - dockerfile: test/docker/ubuntu2010 - network_mode: "host" - security_opt: - - label=type:container_runtime_t - tty: true test-ubuntu2104: build: context: . diff --git a/test/docker/ubuntu2010 b/test/docker/ubuntu2010 deleted file mode 100644 index db60cbd58..000000000 --- a/test/docker/ubuntu2010 +++ /dev/null @@ -1,27 +0,0 @@ -FROM ubuntu:20.10 - -RUN apt-get update -RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev faketime locales python3 - -# Setup language environment -RUN locale-gen en_US.UTF-8 -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"]