Skip to content

Fix several CI issues #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 27, 2025
Merged

Fix several CI issues #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4ee515
Fix several CI issues
gwynne Aug 26, 2025
b2ad020
Fix macOS test matrix
gwynne Aug 26, 2025
b2477c4
Tests can't safely make assumptions about stdlib capacity behavior
gwynne Aug 27, 2025
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
57 changes: 21 additions & 36 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ jobs:
- swift:5.10-jammy
- swift:6.0-noble
- swift:6.1-noble
- swiftlang/swift:nightly-main-jammy
- swiftlang/swift:nightly-6.2-noble
- swiftlang/swift:nightly-main-noble
container: ${{ matrix.swift-image }}
runs-on: ubuntu-latest
steps:
Expand All @@ -32,11 +33,16 @@ jobs:
[[ -z "${SWIFT_VERSION}" ]] && SWIFT_VERSION="$(cat /.swift_tag 2>/dev/null || true)"
printf 'OS: %s\nTag: %s\nVersion:\n' "${SWIFT_PLATFORM}-${RUNNER_ARCH}" "${SWIFT_VERSION}"
swift --version
- name: Install curl for Codecov
run: apt-get update -y -q && apt-get install -y curl
- name: Check out package
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Run unit tests with Thread Sanitizer
shell: bash
run: |
swift test --filter='^(PostgresNIOTests|ConnectionPoolModuleTests)' --sanitize=thread --enable-code-coverage
# https://github.com/swiftlang/swift/issues/74042 was never fixed in 5.10 and swift-crypto hits it in 6.0 as well
SANITIZE="$([[ "${SWIFT_VERSION}" =~ ^swift-(5|6\.0) ]] || echo '--sanitize=thread')"
swift test --filter='^(PostgresNIOTests|ConnectionPoolModuleTests)' ${SANITIZE} --enable-code-coverage
- name: Submit code coverage
uses: vapor/swift-codecov-action@v0.3
with:
Expand Down Expand Up @@ -103,15 +109,15 @@ jobs:
[[ -z "${SWIFT_VERSION}" ]] && SWIFT_VERSION="$(cat /.swift_tag 2>/dev/null || true)"
printf 'OS: %s\nTag: %s\nVersion:\n' "${SWIFT_PLATFORM}-${RUNNER_ARCH}" "${SWIFT_VERSION}" && swift --version
- name: Check out package
uses: actions/checkout@v4
uses: actions/checkout@v5
with: { path: 'postgres-nio' }
- name: Run integration tests
run: swift test --package-path postgres-nio --filter=^IntegrationTests
- name: Check out postgres-kit dependent
uses: actions/checkout@v4
uses: actions/checkout@v5
with: { repository: 'vapor/postgres-kit', path: 'postgres-kit' }
- name: Check out fluent-postgres-driver dependent
uses: actions/checkout@v4
uses: actions/checkout@v5
with: { repository: 'vapor/fluent-postgres-driver', path: 'fluent-postgres-driver' }
- name: Use local package in dependents
run: |
Expand All @@ -132,11 +138,14 @@ jobs:
postgres-auth:
# Only test one auth method on macOS, Linux tests will cover the others
- scram-sha-256
xcode-version:
- '~15'
macos-version:
- 'macos-14'
- 'macos-15'
include:
- xcode-version: '~15'
macos-version: 'macos-14'
- macos-version: 'macos-14'
xcode-version: 'latest-stable'
- macos-version: 'macos-15'
xcode-version: 'latest-stable'
runs-on: ${{ matrix.macos-version }}
env:
POSTGRES_HOSTNAME: 127.0.0.1
Expand All @@ -154,18 +163,13 @@ jobs:
- name: Install Postgres, setup DB and auth, and wait for server start
run: |
export PATH="$(brew --prefix)/opt/${POSTGRES_FORMULA}/bin:$PATH" PGDATA=/tmp/vapor-postgres-test
# ** BEGIN ** Work around bug in both Homebrew and GHA
(brew upgrade python@3.11 || true) && (brew link --force --overwrite python@3.11 || true)
(brew upgrade python@3.12 || true) && (brew link --force --overwrite python@3.12 || true)
(brew upgrade || true)
# ** END ** Work around bug in both Homebrew and GHA
brew install --overwrite "${POSTGRES_FORMULA}"
brew link --overwrite --force "${POSTGRES_FORMULA}"
initdb --locale=C --auth-host "${POSTGRES_AUTH_METHOD}" -U "${POSTGRES_USER}" --pwfile=<(echo "${POSTGRES_PASSWORD}")
pg_ctl start --wait
timeout-minutes: 15
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Run all tests
run: swift test

Expand All @@ -175,30 +179,11 @@ jobs:
container: swift:noble
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/766
- name: API breaking changes
run: |
git config --global --add safe.directory "${GITHUB_WORKSPACE}"
swift package diagnose-api-breaking-changes origin/main

# gh-codeql:
# if: ${{ false }}
# runs-on: ubuntu-latest
# container: swift:noble
# permissions: { actions: write, contents: read, security-events: write }
# steps:
# - name: Check out code
# uses: actions/checkout@v4
# - name: Mark repo safe in non-fake global config
# run: git config --global --add safe.directory "${GITHUB_WORKSPACE}"
# - name: Initialize CodeQL
# uses: github/codeql-action/init@v3
# with:
# languages: swift
# - name: Perform build
# run: swift build
# - name: Run CodeQL analyze
# uses: github/codeql-action/analyze@v3
8 changes: 4 additions & 4 deletions Tests/ConnectionPoolModuleTests/TinyFastSequenceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ final class TinyFastSequenceTests: XCTestCase {
guard case .n(let array) = emptySequence.base else {
return XCTFail("Expected sequence to be backed by an array")
}
XCTAssertEqual(array.capacity, 8)
XCTAssertGreaterThanOrEqual(array.capacity, 8)

var oneElemSequence = TinyFastSequence<Int>(element: 1)
oneElemSequence.reserveCapacity(8)
Expand All @@ -43,22 +43,22 @@ final class TinyFastSequenceTests: XCTestCase {
guard case .n(let array) = oneElemSequence.base else {
return XCTFail("Expected sequence to be backed by an array")
}
XCTAssertEqual(array.capacity, 8)
XCTAssertGreaterThanOrEqual(array.capacity, 8)

var twoElemSequence = TinyFastSequence<Int>([1, 2])
twoElemSequence.reserveCapacity(8)
twoElemSequence.append(3)
guard case .n(let array) = twoElemSequence.base else {
return XCTFail("Expected sequence to be backed by an array")
}
XCTAssertEqual(array.capacity, 8)
XCTAssertGreaterThanOrEqual(array.capacity, 8)

var threeElemSequence = TinyFastSequence<Int>([1, 2, 3])
threeElemSequence.reserveCapacity(8)
guard case .n(let array) = threeElemSequence.base else {
return XCTFail("Expected sequence to be backed by an array")
}
XCTAssertEqual(array.capacity, 8)
XCTAssertGreaterThanOrEqual(array.capacity, 8)
}

func testNewSequenceSlowPath() {
Expand Down