From 8b594e0da530b3c45e4dc91c7b55e05f5546a795 Mon Sep 17 00:00:00 2001 From: David Mohundro Date: Wed, 5 Jan 2022 21:53:29 -0600 Subject: [PATCH] fix: correct to latest iOS and swiftlint issue --- .github/workflows/main.yml | 11 ++++------- Tests/SWXMLHashTests/XMLParsingTests.swift | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1e14329f..9fc07c9e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,6 @@ name: Main -on: - [push, pull_request] +on: [push, pull_request] jobs: mac-test: @@ -13,12 +12,12 @@ jobs: uses: actions/checkout@master - name: Build and test env: - WORKSPACE: "-workspace SWXMLHash.xcworkspace" - ACTION: "build-for-testing test-without-building" + WORKSPACE: "-workspace SWXMLHash.xcworkspace" + ACTION: "build-for-testing test-without-building" run: | set -o pipefail xcodebuild $ACTION $WORKSPACE -scheme "SWXMLHash OSX" | xcpretty - xcodebuild $ACTION $WORKSPACE -scheme "SWXMLHash iOS" -sdk iphonesimulator -destination "OS=14.4,name=iPhone 12" | xcpretty + xcodebuild $ACTION $WORKSPACE -scheme "SWXMLHash iOS" -sdk iphonesimulator -destination "OS=15.0,name=iPhone 12" | xcpretty xcodebuild $ACTION $WORKSPACE -scheme "SWXMLHash tvOS" -sdk appletvsimulator -destination "name=Apple TV" | xcpretty xcodebuild build $WORKSPACE -scheme "SWXMLHash watchOS" -sdk watchsimulator | xcpretty bash <(curl -s https://codecov.io/bash) -t ${{secrets.CODECOV_TOKEN}} @@ -34,5 +33,3 @@ jobs: run: | eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)" swift test - - diff --git a/Tests/SWXMLHashTests/XMLParsingTests.swift b/Tests/SWXMLHashTests/XMLParsingTests.swift index 564e85ea..b6ca92f2 100644 --- a/Tests/SWXMLHashTests/XMLParsingTests.swift +++ b/Tests/SWXMLHashTests/XMLParsingTests.swift @@ -98,7 +98,6 @@ class XMLParsingTests: XCTestCase { XCTAssertEqual(xml!["root"]["catalog"]["book"][1].element?.attribute(by: "id")?.text, "bk102") } - // swiftlint:disable identifier_name func testShouldBeAbleToParseAttributesWithStringRawRepresentable() { enum Keys: String { case root; case catalog; case book; case id