Skip to content

Update CI to use Xcode 12.5 #2

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

Open
Sameesunkaria wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update CI to use Xcode 12.5 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b871b57
Update CI for Xcode 12.5
Sameesunkaria Apr 9, 2021
bc5e424
Remove workaround for watchOS tests.
Sameesunkaria Apr 9, 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
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ on:
jobs:
build:
name: Run tests
runs-on: macos-latest
runs-on: macOS-11.0
strategy:
matrix:
xcode_version: ["12.4"]
xcode_version: ["12.5"]
fail-fast: false

steps:
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
- name: watchOS Tests
run: |
set -o pipefail
DISABLE_TESTS=true xcodebuild -scheme SwiftJQ -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch Series 5 - 40mm' clean build | xcpretty -c
xcodebuild -scheme SwiftJQ -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch Series 5 - 40mm' clean build | xcpretty -c

- name: tvOS Tests
run: |
Expand Down
8 changes: 0 additions & 8 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,3 @@ let package = Package(
checksum: "c307ff4552ab8e110e3ecaf7bf4823991cc5dd059065b32e1b3daf9d15fe7081"),
]
)

import Foundation

// Temporary workaround so builds on watchOS pass.
// watchOS will support XCTest with Xcode 12.5.
if ProcessInfo.processInfo.environment["DISABLE_TESTS"] == "true" {
package.targets.removeAll(where: \.isTest)
}