Skip to content

Dropped Swift 5.9 and fixed nightly CI #33

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 4 commits into from
Apr 22, 2025
Merged

Dropped Swift 5.9 and fixed nightly CI #33

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9685d6b
Dropped Swift 5.9 and fixed nightly CI
thoven87 Apr 22, 2025
c8b5a3d
Update Package.swift
thoven87 Apr 22, 2025
94b9ba9
Dropped the previous format (4 spaces) from Zed
thoven87 Apr 22, 2025
b11bf67
Merge branch 'main' into ci
thoven87 Apr 22, 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
134 changes: 67 additions & 67 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
name: CI

on:
push:
branches:
- main
paths:
- '**.swift'
- '**.yml'
pull_request:
workflow_dispatch:
push:
branches:
- main
paths:
- "**.swift"
- "**.yml"
pull_request:
workflow_dispatch:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-ci
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.ref }}-ci
cancel-in-progress: true

jobs:
linux:
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
matrix:
image:
- 'swift:5.9'
- 'swift:5.10'
- 'swift:6.0'
postgres-image:
- 'postgres:17'
- 'postgres:16'
- 'postgres:14'
include:
- postgres-image: postgres:17
postgres-auth: scram-sha-256
- postgres-image: postgres:16
postgres-auth: scram-sha-256
- postgres-image: postgres:14
postgres-auth: md5
container:
image: ${{ matrix.image }}
volumes: [ 'pgrunshare:/var/run/postgresql' ]
env:
POSTGRES_DB: 'test_database'
POSTGRES_USER: 'test_user'
POSTGRES_PASSWORD: 'test_password'
POSTGRES_HOSTNAME: 'psql'
POSTGRES_SOCKET: '/var/run/postgresql/.s.PGSQL.5432'
POSTGRES_HOST_AUTH_METHOD: ${{ matrix.postgres-auth }}
services:
psql:
image: ${{ matrix.postgres-image }}
volumes: [ 'pgrunshare:/var/run/postgresql' ]
linux:
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
matrix:
image:
- "swift:5.10"
- "swift:6.0"
- "swift:6.1"
postgres-image:
- "postgres:17"
- "postgres:16"
- "postgres:14"
include:
- postgres-image: postgres:17
postgres-auth: scram-sha-256
- postgres-image: postgres:16
postgres-auth: scram-sha-256
- postgres-image: postgres:14
postgres-auth: md5
container:
image: ${{ matrix.image }}
volumes: ["pgrunshare:/var/run/postgresql"]
env:
POSTGRES_DB: 'test_database'
POSTGRES_USER: 'test_user'
POSTGRES_PASSWORD: 'test_password'
POSTGRES_HOST_AUTH_METHOD: ${{ matrix.postgres-auth }}
POSTGRES_INITDB_ARGS: --auth-host=${{ matrix.postgres-auth }}
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Test
run: |
swift test --enable-code-coverage
- name: Convert coverage files
run: |
llvm-cov export -format="lcov" \
.build/debug/swift-jobs-postgresPackageTests.xctest \
-ignore-filename-regex="\/Tests\/" \
-ignore-filename-regex="\/Benchmarks\/" \
-instr-profile .build/debug/codecov/default.profdata > info.lcov
- name: Upload to codecov.io
uses: codecov/codecov-action@v4
with:
files: info.lcov
token: ${{ secrets.CODECOV_TOKEN }}
POSTGRES_DB: "test_database"
POSTGRES_USER: "test_user"
POSTGRES_PASSWORD: "test_password"
POSTGRES_HOSTNAME: "psql"
POSTGRES_SOCKET: "/var/run/postgresql/.s.PGSQL.5432"
POSTGRES_HOST_AUTH_METHOD: ${{ matrix.postgres-auth }}
services:
psql:
image: ${{ matrix.postgres-image }}
volumes: ["pgrunshare:/var/run/postgresql"]
env:
POSTGRES_DB: "test_database"
POSTGRES_USER: "test_user"
POSTGRES_PASSWORD: "test_password"
POSTGRES_HOST_AUTH_METHOD: ${{ matrix.postgres-auth }}
POSTGRES_INITDB_ARGS: --auth-host=${{ matrix.postgres-auth }}
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Test
run: |
swift test --enable-code-coverage
- name: Convert coverage files
run: |
llvm-cov export -format="lcov" \
.build/debug/swift-jobs-postgresPackageTests.xctest \
-ignore-filename-regex="\/Tests\/" \
-ignore-filename-regex="\/Benchmarks\/" \
-instr-profile .build/debug/codecov/default.profdata > info.lcov
- name: Upload to codecov.io
uses: codecov/codecov-action@v4
with:
files: info.lcov
token: ${{ secrets.CODECOV_TOKEN }}
32 changes: 25 additions & 7 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,35 @@ jobs:
strategy:
matrix:
image: ['nightly-focal', 'nightly-jammy', 'nightly-amazonlinux2']
services:
redis:
image: redis
ports:
- 6379:6379
options: --entrypoint redis-server
postgres-image:
- "postgres:17"
- "postgres:14"
include:
- postgres-image: postgres:17
postgres-auth: scram-sha-256
- postgres-image: postgres:14
postgres-auth: md5

container:
image: swiftlang/swift:${{ matrix.image }}
volumes: ["pgrunshare:/var/run/postgresql"]
env:
REDIS_HOSTNAME: "redis"
POSTGRES_DB: "test_database"
POSTGRES_USER: "test_user"
POSTGRES_PASSWORD: "test_password"
POSTGRES_HOSTNAME: "psql"
POSTGRES_SOCKET: "/var/run/postgresql/.s.PGSQL.5432"
POSTGRES_HOST_AUTH_METHOD: ${{ matrix.postgres-auth }}
services:
psql:
image: ${{ matrix.postgres-image }}
volumes: ["pgrunshare:/var/run/postgresql"]
env:
POSTGRES_DB: "test_database"
POSTGRES_USER: "test_user"
POSTGRES_PASSWORD: "test_password"
POSTGRES_HOST_AUTH_METHOD: ${{ matrix.postgres-auth }}
POSTGRES_INITDB_ARGS: --auth-host=${{ matrix.postgres-auth }}

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 5.9
// swift-tools-version: 5.10

import PackageDescription

Expand Down