Skip to content

Commit 07616fd

Browse files
authored
Drop Swift 5.9 (#2231)
Swift 6.1 has been released so we can drop 5.9 support per our policy.
1 parent 5c58b63 commit 07616fd

File tree

2 files changed

+7
-29
lines changed

2 files changed

+7
-29
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: License Header and Formatting Checks
1010
runs-on: ubuntu-latest
1111
container:
12-
image: swift:6.0-jammy
12+
image: swift:6.1
1313
steps:
1414
- name: "Checkout repository"
1515
uses: actions/checkout@v4
@@ -25,18 +25,9 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
include:
28-
- image: swiftlang/swift:nightly-jammy
29-
# No TSAN because of: https://github.com/apple/swift/issues/59068
30-
# swift-test-flags: "--sanitize=thread"
28+
- image: swift:6.1
3129
- image: swift:6.0-jammy
32-
# No TSAN because of: https://github.com/apple/swift/issues/59068
33-
# swift-test-flags: "--sanitize=thread"
3430
- image: swift:5.10.1-noble
35-
# No TSAN because of: https://github.com/apple/swift/issues/59068
36-
# swift-test-flags: "--sanitize=thread"
37-
- image: swift:5.9-jammy
38-
# No TSAN because of: https://github.com/apple/swift/issues/59068
39-
# swift-test-flags: "--sanitize=thread"
4031
name: Build and Test on ${{ matrix.image }}
4132
runs-on: ubuntu-latest
4233
container:
@@ -54,8 +45,8 @@ jobs:
5445
fail-fast: false
5546
matrix:
5647
include:
57-
- image: swiftlang/swift:nightly-jammy
58-
swift-version: 'main'
48+
- image: swift:6.1
49+
swift-version: '6.1'
5950
env:
6051
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_10_requests: 323000
6152
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_1_request: 161000
@@ -87,17 +78,6 @@ jobs:
8778
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong: 163000
8879
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_client: 170000
8980
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_server: 170000
90-
- image: swift:5.9-jammy
91-
swift-version: 5.9
92-
env:
93-
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_10_requests: 323000
94-
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_1_request: 161000
95-
MAX_ALLOCS_ALLOWED_embedded_server_bidi_1k_rpcs_10_small_requests: 110000
96-
MAX_ALLOCS_ALLOWED_embedded_server_bidi_1k_rpcs_1_small_request: 65000
97-
MAX_ALLOCS_ALLOWED_embedded_server_unary_1k_rpcs_1_small_request: 61000
98-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong: 163000
99-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_client: 170000
100-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_server: 170000
10181
name: Performance Tests on ${{ matrix.image }}
10282
runs-on: ubuntu-latest
10383
container:
@@ -113,14 +93,12 @@ jobs:
11393
fail-fast: false
11494
matrix:
11595
include:
116-
- image: swiftlang/swift:nightly-jammy
117-
swift-tools-version: '6.0'
96+
- image: swift:6.1
97+
swift-tools-version: '6.1'
11898
- image: swift:6.0-jammy
11999
swift-tools-version: '6.0'
120100
- image: swift:5.10.1-noble
121101
swift-tools-version: '5.10'
122-
- image: swift:5.9-jammy
123-
swift-tools-version: '5.9'
124102
name: Integration Tests on ${{ matrix.image }}
125103
runs-on: ubuntu-latest
126104
container:

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:5.10
22
/*
33
* Copyright 2017, gRPC Authors All rights reserved.
44
*

0 commit comments

Comments
 (0)