diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index fd5219d69..fd24ae666 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.com/finestructure/spi-base:1.2.0 +FROM registry.gitlab.com/finestructure/spi-base:1.1.1 # 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 e124ef40b..c996440a4 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.2.0 + image: registry.gitlab.com/finestructure/spi-base:1.1.1 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.2.0 + image: registry.gitlab.com/finestructure/spi-base:1.1.1 options: --privileged steps: - name: GH Runner bug workaround diff --git a/.github/workflows/query-performance.yml b/.github/workflows/query-performance.yml index 70b29c357..3125a3e7f 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.2.0 + image: registry.gitlab.com/finestructure/spi-base:1.1.1 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index c90ff28dc..839d3939c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # ================================ # Build image # ================================ -FROM registry.gitlab.com/finestructure/spi-base:1.2.0 as build +FROM registry.gitlab.com/finestructure/spi-base:1.1.1 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.2.0 +FROM registry.gitlab.com/finestructure/spi-base:1.1.1 # 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 be3a562f2..56fdbcc69 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.2.0 swift test +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 ``` 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 692dfdea9..af61190a3 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.2.0 \ + registry.gitlab.com/finestructure/spi-base:1.1.1 \ make test test-e2e: db-reset reconcile ingest analyze diff --git a/Tests/AppTests/AllTests.swift b/Tests/AppTests/AllTests.swift index ca659459e..a7f4c67d0 100644 --- a/Tests/AppTests/AllTests.swift +++ b/Tests/AppTests/AllTests.swift @@ -15,14 +15,12 @@ @testable import App import Dependencies -import SnapshotTesting import Testing @Suite( .dependency(\.date.now, .t0), - .dependency(\.metricsSystem, .mock), - .snapshots(record: .failed) + .dependency(\.metricsSystem, .mock) ) struct AllTests { } diff --git a/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.linux.json b/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.linux.json index d2e2c2a86..c5f316a6c 100644 --- a/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.linux.json +++ b/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.linux.json @@ -21,12 +21,7 @@ "upperBound" : "510.0.0" } ] - }, - "traits" : [ - { - "name" : "default" - } - ] + } } ] } @@ -209,8 +204,5 @@ ], "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 9ac50bfc0..783d7af20 100644 --- a/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.macos.json +++ b/Tests/AppTests/__Snapshots__/AnalyzerTests/dumpPackage_format.macos.json @@ -21,12 +21,7 @@ "upperBound" : "510.0.0" } ] - }, - "traits" : [ - { - "name" : "default" - } - ] + } } ] } @@ -215,8 +210,5 @@ ], "toolsVersion" : { "_version" : "5.9.0" - }, - "traits" : [ - - ] + } } \ No newline at end of file