Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Xcode 12.4 to the test.yml workflow #149

Merged
merged 3 commits into from
May 6, 2021
Merged

Add Xcode 12.4 to the test.yml workflow #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f593319
Add Xcode 12.4 to the `test.yml` workflow
MaxDesiatov May 6, 2021
6353315
Test with Swift 5.4 on Linux
MaxDesiatov May 6, 2021
c2d3d15
Fix linter warnings
MaxDesiatov May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,16 @@ jobs:
env:
IOS_DEVICE: "platform=iOS Simulator,OS=14.3,name=iPhone 8"
TVOS_DEVICE: "platform=tvOS Simulator,OS=14.3,name=Apple TV 4K"

xcode_12_4:
runs-on: macos-10.15

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Build and Test
run: |
./test_xcodebuild.sh Xcode_12.4
env:
IOS_DEVICE: "platform=iOS Simulator,OS=14.4,name=iPhone 8"
TVOS_DEVICE: "platform=tvOS Simulator,OS=14.3,name=Apple TV 4K"
4 changes: 2 additions & 2 deletions Sources/CoreXLSX/XLSXFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public class XLSXFile {
) throws -> [(name: String?, path: String)] {
try parseDocumentPaths().map {
try parseDocumentRelationships(path: $0)
}.flatMap { (path, relationships) -> [(name: String?, path: String)] in
}.flatMap { path, relationships -> [(name: String?, path: String)] in
let worksheets = relationships.items.filter { $0.type == .worksheet }

guard !path.isRoot else { return worksheets.map { (name: nil, path: $0.target) } }
Expand All @@ -263,7 +263,7 @@ public class XLSXFile {
public func parseWorksheetPaths() throws -> [String] {
try parseDocumentPaths().map {
try parseDocumentRelationships(path: $0)
}.flatMap { (path, relationships) -> [String] in
}.flatMap { path, relationships -> [String] in
let worksheets = relationships.items.filter { $0.type == .worksheet }

guard !path.isRoot else { return worksheets.map { $0.target } }
Expand Down
2 changes: 1 addition & 1 deletion Tests/CoreXLSXTests/SharedStrings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ final class SharedStringsTests: XCTestCase {
func testRichTextXML() throws {
let decoder = XMLDecoder()
let strings = try decoder.decode(SharedStrings.self, from: richTextXML)
let text = strings.items[1].richText.reduce("") { (t, rt) -> String in
let text = strings.items[1].richText.reduce("") { t, rt -> String in
t + (rt.text ?? "")
}
XCTAssertEqual(text, "CellA2")
Expand Down
12 changes: 9 additions & 3 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,25 @@ jobs:

- job: test_linux_5_1
pool:
vmImage: "Ubuntu 18.04"
vmImage: "Ubuntu 20.04"
container: norionomura/swift:515
steps:
- script: ./test_swiftpm.sh
- job: test_linux_5_2
pool:
vmImage: "Ubuntu 18.04"
vmImage: "Ubuntu 20.04"
container: norionomura/swift:525
steps:
- script: ./test_swiftpm.sh
- job: test_linux_5_3
pool:
vmImage: "Ubuntu 18.04"
vmImage: "Ubuntu 20.04"
container: norionomura/swift:53
steps:
- script: ./test_swiftpm.sh
- job: test_linux_5_4
pool:
vmImage: "Ubuntu 20.04"
container: norionomura/swift:54
steps:
- script: ./test_swiftpm.sh