diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index fd24ae666..fd5219d69 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.com/finestructure/spi-base:1.1.1 +FROM registry.gitlab.com/finestructure/spi-base:1.2.0 # Install SPM build dependencies RUN apt-get update && apt-get install -y curl git make unzip \ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c996440a4..e124ef40b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: name: Test runs-on: ubuntu-latest container: - image: registry.gitlab.com/finestructure/spi-base:1.1.1 + image: registry.gitlab.com/finestructure/spi-base:1.2.0 options: --privileged services: postgres: @@ -64,7 +64,7 @@ jobs: name: Release build runs-on: ubuntu-latest container: - image: registry.gitlab.com/finestructure/spi-base:1.1.1 + image: registry.gitlab.com/finestructure/spi-base:1.2.0 options: --privileged steps: - name: GH Runner bug workaround diff --git a/.github/workflows/query-performance.yml b/.github/workflows/query-performance.yml index 3125a3e7f..70b29c357 100644 --- a/.github/workflows/query-performance.yml +++ b/.github/workflows/query-performance.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest continue-on-error: true container: - image: registry.gitlab.com/finestructure/spi-base:1.1.1 + image: registry.gitlab.com/finestructure/spi-base:1.2.0 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index 839d3939c..c90ff28dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # ================================ # Build image # ================================ -FROM registry.gitlab.com/finestructure/spi-base:1.1.1 as build +FROM registry.gitlab.com/finestructure/spi-base:1.2.0 as build # Set up a build area WORKDIR /build @@ -61,7 +61,7 @@ RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w # ================================ # Run image # ================================ -FROM registry.gitlab.com/finestructure/spi-base:1.1.1 +FROM registry.gitlab.com/finestructure/spi-base:1.2.0 # NB sas 2022-09-23: We're not using a dedicated `vapor` user to run the executable, because it # makes managing the data in the checkouts volume difficult. See diff --git a/LOCAL_DEVELOPMENT_SETUP.md b/LOCAL_DEVELOPMENT_SETUP.md index 56fdbcc69..be3a562f2 100644 --- a/LOCAL_DEVELOPMENT_SETUP.md +++ b/LOCAL_DEVELOPMENT_SETUP.md @@ -236,7 +236,7 @@ The trickiest part of this is to ensure the test or app container can connect to So, in order to run the tests in a Linux container run: ``` -docker run --rm -v "$PWD":/host -w /host --add-host=host.docker.internal:host-gateway registry.gitlab.com/finestructure/spi-base:1.1.1 swift test +docker run --rm -v "$PWD":/host -w /host --add-host=host.docker.internal:host-gateway registry.gitlab.com/finestructure/spi-base:1.2.0 swift test ``` Make sure you use the most recent `spi-base` image. You can find the latest image name in the `test-docker` target, which also provides a convenient way to run all all tests in a docker container. diff --git a/Makefile b/Makefile index af61190a3..692dfdea9 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ test-docker: @# run tests inside a docker container docker run --rm -v "$(PWD)":/host -w /host \ --add-host=host.docker.internal:host-gateway \ - registry.gitlab.com/finestructure/spi-base:1.1.1 \ + registry.gitlab.com/finestructure/spi-base:1.2.0 \ make test test-e2e: db-reset reconcile ingest analyze diff --git a/Tests/AppTests/AllTests.swift b/Tests/AppTests/AllTests.swift index a7f4c67d0..ca659459e 100644 --- a/Tests/AppTests/AllTests.swift +++ b/Tests/AppTests/AllTests.swift @@ -15,12 +15,14 @@ @testable import App import Dependencies +import SnapshotTesting import Testing @Suite( .dependency(\.date.now, .t0), - .dependency(\.metricsSystem, .mock) + .dependency(\.metricsSystem, .mock), + .snapshots(record: .failed) ) struct AllTests { } diff --git a/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.linux.json b/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.linux.json index c5f316a6c..d2e2c2a86 100644 --- a/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.linux.json +++ b/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.linux.json @@ -21,7 +21,12 @@ "upperBound" : "510.0.0" } ] - } + }, + "traits" : [ + { + "name" : "default" + } + ] } ] } @@ -204,5 +209,8 @@ ], "toolsVersion" : { "_version" : "5.9.0" - } + }, + "traits" : [ + + ] } \ No newline at end of file diff --git a/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.macos.json b/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.macos.json index 783d7af20..9ac50bfc0 100644 --- a/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.macos.json +++ b/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.macos.json @@ -21,7 +21,12 @@ "upperBound" : "510.0.0" } ] - } + }, + "traits" : [ + { + "name" : "default" + } + ] } ] } @@ -210,5 +215,8 @@ ], "toolsVersion" : { "_version" : "5.9.0" - } + }, + "traits" : [ + + ] } \ No newline at end of file