Skip to content

Commit 204a378

Browse files
authored
Merge branch 'main' into enable_static_sdk_ci
2 parents 39a3e15 + 62da8d9 commit 204a378

File tree

6 files changed

+22
-9
lines changed

6 files changed

+22
-9
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
name: Unit tests
1212
uses: ./.github/workflows/unit_tests.yml
1313
with:
14-
linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
1514
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
1615
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
16+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
1717
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
1818
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
1919

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
name: Unit tests
1717
uses: ./.github/workflows/unit_tests.yml
1818
with:
19-
linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
2019
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
2120
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
21+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
2222
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
2323
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2424

.github/workflows/unit_tests.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
inputs:
66
linux_5_9_enabled:
77
type: boolean
8-
description: "Boolean to enable the Linux 5.9 Swift version matrix job. Defaults to true."
9-
default: true
8+
description: "Boolean to enable the Linux 5.9 Swift version matrix job. Defaults to false."
9+
default: false
1010
linux_5_9_arguments_override:
1111
type: string
1212
description: "The arguments passed to swift test in the Linux 5.9 Swift version matrix job."
@@ -27,13 +27,21 @@ on:
2727
type: string
2828
description: "The arguments passed to swift test in the Linux 6.0 Swift version matrix job."
2929
default: ""
30+
linux_6_1_enabled:
31+
type: boolean
32+
description: "Boolean to enable the Linux 6.1 Swift version matrix job. Defaults to true."
33+
default: true
34+
linux_6_1_arguments_override:
35+
type: string
36+
description: "The arguments passed to swift test in the Linux 6.1 Swift version matrix job."
37+
default: ""
3038
linux_nightly_next_enabled:
3139
type: boolean
32-
description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
40+
description: "Boolean to enable the Linux nightly next Swift version matrix job. Defaults to true."
3341
default: true
3442
linux_nightly_next_arguments_override:
3543
type: string
36-
description: "The arguments passed to swift test in the Linux nightly 6.1 Swift version matrix job."
44+
description: "The arguments passed to swift test in the Linux nightly next Swift version matrix job."
3745
default: ""
3846
linux_nightly_main_enabled:
3947
type: boolean
@@ -62,6 +70,9 @@ jobs:
6270
- image: "swift:6.0-jammy"
6371
swift_version: "6.0"
6472
enabled: ${{ inputs.linux_6_0_enabled }}
73+
- image: "swift:6.1-jammy"
74+
swift_version: "6.1"
75+
enabled: ${{ inputs.linux_6_1_enabled }}
6576
- image: "swiftlang/swift:nightly-6.1-jammy"
6677
swift_version: "nightly-6.1"
6778
enabled: ${{ inputs.linux_nightly_next_enabled }}
@@ -87,6 +98,7 @@ jobs:
8798
COMMAND_OVERRIDE_5_9: "swift test ${{ inputs.linux_5_9_arguments_override }}"
8899
COMMAND_OVERRIDE_5_10: "swift test ${{ inputs.linux_5_10_arguments_override }}"
89100
COMMAND_OVERRIDE_6_0: "swift test ${{ inputs.linux_6_0_arguments_override }}"
101+
COMMAND_OVERRIDE_6_1: "swift test ${{ inputs.linux_6_1_arguments_override }}"
90102
COMMAND_OVERRIDE_NIGHTLY_NEXT: "swift test ${{ inputs.linux_nightly_next_arguments_override }}"
91103
COMMAND_OVERRIDE_NIGHTLY_MAIN: "swift test ${{ inputs.linux_nightly_main_arguments_override }}"
92104
run: |

Benchmarks/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.7
1+
// swift-tools-version:5.10
22
//===----------------------------------------------------------------------===//
33
//
44
// This source file is part of the swift-kafka-client open source project

Package.swift

Lines changed: 2 additions & 2 deletions
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
//
44
// This source file is part of the swift-kafka-client open source project
@@ -102,7 +102,7 @@ let package = Package(
102102
name: "COpenSSL",
103103
pkgConfig: "openssl",
104104
providers: [
105-
.brew(["libressl"]),
105+
.brew(["openssl@3"]),
106106
.apt(["libssl-dev"]),
107107
]
108108
),

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ It has source files that are excluded in `Package.swift`.
243243
### Dependencies
244244

245245
`librdkafka` depends on `openssl`, meaning that `libssl-dev` must be present at build time.
246+
`openssl@3` can be installed on macOS, among others, through `brew`.
246247

247248
## Development Setup
248249

0 commit comments

Comments
 (0)