Skip to content

Commit 9bdb0d1

Browse files
authored
Filter down main to v2 (#2066)
Motivation: v2 will be split across a number of packages, and v1 will be maintained on the 'release/1.x' branch. In order to do the package split this package needs to be whittled down to only the v2 components which will remain within this package. Modifications: - Remove v1 code - Remove v2 code destined for other packages - Reshuffle a few scripts Result: - Package contains only the intended code
1 parent 20269e0 commit 9bdb0d1

File tree

687 files changed

+142
-138993
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

687 files changed

+142
-138993
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: apt update && apt install -y protobuf-compiler
2020
- name: "Formatting, License Headers, and Generated Code check"
2121
run: |
22-
./scripts/sanity.sh
22+
./dev/sanity.sh
2323
unit-tests:
2424
strategy:
2525
fail-fast: false
@@ -31,12 +31,6 @@ jobs:
3131
- image: swift:6.0-jammy
3232
# No TSAN because of: https://github.com/apple/swift/issues/59068
3333
# swift-test-flags: "--sanitize=thread"
34-
- 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"
4034
name: Build and Test on ${{ matrix.image }}
4135
runs-on: ubuntu-latest
4236
container:
@@ -56,104 +50,18 @@ jobs:
5650
include:
5751
- image: swiftlang/swift:nightly-jammy
5852
swift-version: 'main'
59-
env:
60-
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_10_requests: 323000
61-
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_1_request: 161000
62-
MAX_ALLOCS_ALLOWED_embedded_server_bidi_1k_rpcs_10_small_requests: 110000
63-
MAX_ALLOCS_ALLOWED_embedded_server_bidi_1k_rpcs_1_small_request: 65000
64-
MAX_ALLOCS_ALLOWED_embedded_server_unary_1k_rpcs_1_small_request: 61000
65-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong: 163000
66-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_client: 170000
67-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_server: 170000
6853
- image: swift:6.0-jammy
6954
swift-version: '6.0'
70-
env:
71-
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_10_requests: 323000
72-
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_1_request: 161000
73-
MAX_ALLOCS_ALLOWED_embedded_server_bidi_1k_rpcs_10_small_requests: 110000
74-
MAX_ALLOCS_ALLOWED_embedded_server_bidi_1k_rpcs_1_small_request: 65000
75-
MAX_ALLOCS_ALLOWED_embedded_server_unary_1k_rpcs_1_small_request: 61000
76-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong: 163000
77-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_client: 170000
78-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_server: 170000
79-
- image: swift:5.10.1-noble
80-
swift-version: '5.10'
81-
env:
82-
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_10_requests: 323000
83-
MAX_ALLOCS_ALLOWED_bidi_1k_rpcs_1_request: 161000
84-
MAX_ALLOCS_ALLOWED_embedded_server_bidi_1k_rpcs_10_small_requests: 110000
85-
MAX_ALLOCS_ALLOWED_embedded_server_bidi_1k_rpcs_1_small_request: 65000
86-
MAX_ALLOCS_ALLOWED_embedded_server_unary_1k_rpcs_1_small_request: 61000
87-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong: 163000
88-
MAX_ALLOCS_ALLOWED_unary_1k_ping_pong_interceptors_client: 170000
89-
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
10155
name: Performance Tests on ${{ matrix.image }}
10256
runs-on: ubuntu-latest
10357
container:
10458
image: ${{ matrix.image }}
10559
steps:
10660
- uses: actions/checkout@v4
107-
- name: 🧮 Allocation Counting Tests
108-
run: ./Performance/allocations/test-allocation-counts.sh
109-
env: ${{ matrix.env }}
110-
timeout-minutes: 20
11161
- name: Install jemalloc for benchmarking
112-
if: ${{ matrix.swift-version == '6.0' || matrix.swift-version == 'main' }}
11362
run: apt update && apt-get install -y libjemalloc-dev
11463
timeout-minutes: 20
11564
- name: Run Benchmarks
116-
if: ${{ matrix.swift-version == '6.0' || matrix.swift-version == 'main' }}
117-
working-directory: ./Performance/Benchmarks
65+
working-directory: "./IntegrationTests/Benchmarks"
11866
run: swift package benchmark baseline check --no-progress --check-absolute-path Thresholds/${{ matrix.swift-version }}/
11967
timeout-minutes: 20
120-
integration-tests:
121-
strategy:
122-
fail-fast: false
123-
matrix:
124-
include:
125-
- image: swiftlang/swift:nightly-jammy
126-
swift-tools-version: '6.0'
127-
supports-v2: true
128-
- image: swift:6.0-jammy
129-
swift-tools-version: '6.0'
130-
supports-v2: true
131-
- image: swift:5.10.1-noble
132-
swift-tools-version: '5.10'
133-
supports-v2: false
134-
- image: swift:5.9-jammy
135-
swift-tools-version: '5.9'
136-
supports-v2: false
137-
name: Integration Tests on ${{ matrix.image }}
138-
runs-on: ubuntu-latest
139-
container:
140-
image: ${{ matrix.image }}
141-
steps:
142-
- uses: actions/checkout@v4
143-
- name: Install protoc
144-
run: apt update && apt install -y protobuf-compiler
145-
- name: SwiftPM plugin test (v1)
146-
run: ./scripts/run-plugin-tests.sh ${{ matrix.swift-tools-version }} "v1"
147-
- name: SwiftPM plugin test (v2)
148-
if: ${{ matrix.supports-v2 }}
149-
run: ./scripts/run-plugin-tests.sh ${{ matrix.swift-tools-version }} "v2"
150-
- name: Build without NIOSSL
151-
run: swift build
152-
env:
153-
GRPC_NO_NIO_SSL: 1
154-
timeout-minutes: 20
155-
- name: Test without NIOSSL
156-
run: swift test
157-
env:
158-
GRPC_NO_NIO_SSL: 1
159-
timeout-minutes: 20

.github/workflows/release.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

AUTHORS

Lines changed: 0 additions & 1 deletion
This file was deleted.

Examples/v1/Echo/Implementation/EchoAsyncProvider.swift

Lines changed: 0 additions & 69 deletions
This file was deleted.

Examples/v1/Echo/Implementation/EchoProvider.swift

Lines changed: 0 additions & 88 deletions
This file was deleted.

Examples/v1/Echo/Implementation/HPACKHeaders+Prettify.swift

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)