Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/query-performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion LOCAL_DEVELOPMENT_SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Tests/AppTests/AllTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member Author

@finestructure finestructure Apr 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great quality of life change in SnapshotTesting: The if a snapshot test fails, it will automatically record a new snapshot.

That means that in order to update snapshots, we don't need to edit tests anymore. We just need to check if there are snapshot differences and commit or revert them as needed.

) struct AllTests { }


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@
"upperBound" : "510.0.0"
}
]
}
},
"traits" : [
{
"name" : "default"
}
]
}
]
}
Expand Down Expand Up @@ -204,5 +209,8 @@
],
"toolsVersion" : {
"_version" : "5.9.0"
}
},
"traits" : [

]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Swift 6.1 package dump format changes.

}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@
"upperBound" : "510.0.0"
}
]
}
},
"traits" : [
{
"name" : "default"
}
]
}
]
}
Expand Down Expand Up @@ -210,5 +215,8 @@
],
"toolsVersion" : {
"_version" : "5.9.0"
}
},
"traits" : [

]
}
Loading