Skip to content

Commit 472c95f

Browse files
authored
Drop 5.10 and 6.0 (#2262)
Motivation: In line with our support policy (see README.md), now that Swift 6.2 has been released we can drop 5.10 and 6.0. Modifications: - Update CI - Update Package.swift to use `static` computed `var`s as it no longer builds with 6.x compilers as the various SwiftPM types aren't sendable Result: Less support
1 parent d1dceff commit 472c95f

File tree

2 files changed

+476
-403
lines changed

2 files changed

+476
-403
lines changed

.github/workflows/ci.yaml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
include:
28-
- image: swift:6.1
29-
swift-build-flags: -c release
30-
- image: swift:6.0-jammy
28+
- image: swift:6.2
3129
swift-build-flags: -c release
32-
- image: swift:5.10.1-noble
30+
- image: swift:6.1
3331
swift-build-flags: -c release
3432
name: Build and Test on ${{ matrix.image }}
3533
runs-on: ubuntu-latest
@@ -48,19 +46,8 @@ jobs:
4846
fail-fast: false
4947
matrix:
5048
include:
51-
- image: swift:6.1
52-
swift-version: '6.1'
53-
env:
54-
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_10_requests: 323000
55-
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_1_request: 161000
56-
MAX_ALLOCS_ALLOWED_embedded_server_bidi_1k_rpcs_10_small_requests: 110000
57-
MAX_ALLOCS_ALLOWED_embedded_server_bidi_1k_rpcs_1_small_request: 65000
58-
MAX_ALLOCS_ALLOWED_embedded_server_unary_1k_rpcs_1_small_request: 61000
59-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong: 163000
60-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_client: 170000
61-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_server: 170000
62-
- image: swift:6.0-jammy
63-
swift-version: '6.0'
49+
- image: swift:6.2
50+
swift-version: '6.2'
6451
env:
6552
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_10_requests: 323000
6653
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_1_request: 161000
@@ -70,8 +57,8 @@ jobs:
7057
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong: 163000
7158
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_client: 170000
7259
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_server: 170000
73-
- image: swift:5.10.1-noble
74-
swift-version: '5.10'
60+
- image: swift:6.1
61+
swift-version: '6.1'
7562
env:
7663
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_10_requests: 323000
7764
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_1_request: 161000
@@ -96,12 +83,10 @@ jobs:
9683
fail-fast: false
9784
matrix:
9885
include:
86+
- image: swift:6.2
87+
swift-tools-version: '6.2'
9988
- image: swift:6.1
10089
swift-tools-version: '6.1'
101-
- image: swift:6.0-jammy
102-
swift-tools-version: '6.0'
103-
- image: swift:5.10.1-noble
104-
swift-tools-version: '5.10'
10590
name: Integration Tests on ${{ matrix.image }}
10691
runs-on: ubuntu-latest
10792
container:

0 commit comments

Comments
 (0)