From c83da0b68e5344711f06aea979dff16528ac686d Mon Sep 17 00:00:00 2001 From: yubiuser Date: Thu, 19 Sep 2024 21:11:00 +0200 Subject: [PATCH] Update base image and remove purposely added failing test Signed-off-by: yubiuser --- .github/Dockerfile | 5 ++--- test/test_suite.bats | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index 0cf7f2df..094c9ef2 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/pi-hole/ftl-build:v2.7 AS builder +FROM ghcr.io/pi-hole/ftl-build:v2.8 AS builder WORKDIR /app @@ -13,8 +13,7 @@ ENV GIT_TAG=${GIT_TAG} ARG BUILD_OPTS="" ENV BUILD_OPTS=${BUILD_OPTS} -# Add ncurses used for pretty output in bats tests -RUN apk add --no-cache ncurses +# Setting TERM is needed for pretty output in BATS tests ENV TERM=xterm # Monkeypatch BATS to remove duplicate output of starting and finished test diff --git a/test/test_suite.bats b/test/test_suite.bats index b610d1e1..2860776f 100644 --- a/test/test_suite.bats +++ b/test/test_suite.bats @@ -1,9 +1,5 @@ #!./test/libs/bats/bin/bats -@test 'fail()' { - fail 'this test always fails' -} - @test "Compare template and test TOML config files" { # We skip the first 5 lines of the files as they contain the version and # timestamp of the file creation/modification