Skip to content

Commit

Permalink
Add swift 5.10 to CI to the 1.x branch.
Browse files Browse the repository at this point in the history
Add the 5.9 and 5.10 Package.swift files also (copies of the 5.8).
  • Loading branch information
thomasvl committed Mar 19, 2024
1 parent fe38d0a commit bfcd341
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ jobs:
strategy:
fail-fast: false
matrix:
swift: ["5.9.2", "5.8.1", "5.7.3", "5.6.3", "5.5.3", "5.4.3", "5.3.3", "5.2.5", "5.1.5", "5.0.3", "4.2.4"]
swift: ["5.10.0", "5.9.2", "5.8.1", "5.7.3", "5.6.3", "5.5.3", "5.4.3", "5.3.3", "5.2.5", "5.1.5", "5.0.3", "4.2.4"]
# protobuf_git can reference a commit, tag, or branch
# commit: "commits/6935eae45c99926a000ecbef0be20dfd3d159e71"
# tag: "ref/tags/v3.11.4"
# branch: "ref/heads/main"
protobuf_git: ["ref/heads/main"]
include:
- swift: 5.10.0
ubuntu: -jammy
generate_linux_main: false
build_protobuf: true
- swift: 5.9.2
ubuntu: -jammy
generate_linux_main: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/regular_conformance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
swift: ["5.9.2"]
swift: ["5.10.0"]
ubuntu: ["jammy"]
# protobuf_git can reference a commit, tag, or branch
# commit: "commits/6935eae45c99926a000ecbef0be20dfd3d159e71"
Expand Down
48 changes: 48 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// swift-tools-version:5.6

// Package.swift
//
// Copyright (c) 2014 - 2018 Apple Inc. and the project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See LICENSE.txt for license information:
// https://github.com/apple/swift-protobuf/blob/main/LICENSE.txt
//

import PackageDescription

let package = Package(
name: "SwiftProtobuf",
products: [
.executable(name: "protoc-gen-swift", targets: ["protoc-gen-swift"]),
.library(name: "SwiftProtobuf", targets: ["SwiftProtobuf"]),
.library(name: "SwiftProtobufPluginLibrary", targets: ["SwiftProtobufPluginLibrary"]),
.plugin(
name: "SwiftProtobufPlugin",
targets: ["SwiftProtobufPlugin"]
),
],
targets: [
.target(name: "SwiftProtobuf",
resources: [.copy("PrivacyInfo.xcprivacy")]),
.target(name: "SwiftProtobufPluginLibrary",
dependencies: ["SwiftProtobuf"],
resources: [.copy("PrivacyInfo.xcprivacy")]),
.executableTarget(name: "protoc-gen-swift",
dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
.executableTarget(name: "Conformance",
dependencies: ["SwiftProtobuf"]),
.plugin(
name: "SwiftProtobufPlugin",
capability: .buildTool(),
dependencies: [
"protoc-gen-swift"
]
),
.testTarget(name: "SwiftProtobufTests",
dependencies: ["SwiftProtobuf"]),
.testTarget(name: "SwiftProtobufPluginLibraryTests",
dependencies: ["SwiftProtobufPluginLibrary"]),
],
swiftLanguageVersions: [.v4, .v4_2, .version("5")]
)
48 changes: 48 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// swift-tools-version:5.6

// Package.swift
//
// Copyright (c) 2014 - 2018 Apple Inc. and the project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See LICENSE.txt for license information:
// https://github.com/apple/swift-protobuf/blob/main/LICENSE.txt
//

import PackageDescription

let package = Package(
name: "SwiftProtobuf",
products: [
.executable(name: "protoc-gen-swift", targets: ["protoc-gen-swift"]),
.library(name: "SwiftProtobuf", targets: ["SwiftProtobuf"]),
.library(name: "SwiftProtobufPluginLibrary", targets: ["SwiftProtobufPluginLibrary"]),
.plugin(
name: "SwiftProtobufPlugin",
targets: ["SwiftProtobufPlugin"]
),
],
targets: [
.target(name: "SwiftProtobuf",
resources: [.copy("PrivacyInfo.xcprivacy")]),
.target(name: "SwiftProtobufPluginLibrary",
dependencies: ["SwiftProtobuf"],
resources: [.copy("PrivacyInfo.xcprivacy")]),
.executableTarget(name: "protoc-gen-swift",
dependencies: ["SwiftProtobufPluginLibrary", "SwiftProtobuf"]),
.executableTarget(name: "Conformance",
dependencies: ["SwiftProtobuf"]),
.plugin(
name: "SwiftProtobufPlugin",
capability: .buildTool(),
dependencies: [
"protoc-gen-swift"
]
),
.testTarget(name: "SwiftProtobufTests",
dependencies: ["SwiftProtobuf"]),
.testTarget(name: "SwiftProtobufPluginLibraryTests",
dependencies: ["SwiftProtobufPluginLibrary"]),
],
swiftLanguageVersions: [.v4, .v4_2, .version("5")]
)

0 comments on commit bfcd341

Please sign in to comment.