Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
58 changes: 52 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ jobs:
fail-fast: false
matrix:
xcode:
- '11.7'
- '12.4'
- "12.4"
steps:
- uses: actions/checkout@v2

Expand All @@ -40,8 +39,7 @@ jobs:
fail-fast: false
matrix:
xcode:
- '11.7'
- '12.4'
- "12.4"
platform: ["iOS", "tvOS", "macOS"]

steps:
Expand Down Expand Up @@ -82,13 +80,61 @@ jobs:
with:
fail_ci_if_error: true

watchos_xcode_tests:
name: ${{ matrix.platform }} on Xcode ${{ matrix.xcode }}
runs-on: macos-11
strategy:
fail-fast: false
matrix:
xcode:
- "12.5"
platform: ["watchOS"]

steps:
- uses: actions/checkout@v2

- name: Select Xcode ${{ matrix.xcode }}
run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app

- name: Cache Bundler
uses: actions/cache@v2
with:
path: vendor/bundle
key: ${{ runner.os }}-bundler-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-bundler-

- name: bundle install
run: bundle install --deployment

- name: Cache Carthage
uses: actions/cache@v2
with:
path: Carthage
key: ${{ runner.os }}-xcode_${{ matrix.xcode }}-${{ matrix.platform }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
restore-keys: |
${{ runner.os }}-carthage-

- name: carthage bootstrap
run: ./scripts/carthage.sh bootstrap --cache-builds --platform ${{ matrix.platform }} --configuration Debug || (cat /var/folders/*/*/*/carthage-xcodebuild.*.log; false)
env:
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Test ${{ matrix.platform }}
run: bundle exec fastlane scan --clean --scheme "Partial-${{ matrix.platform }}" --device "Apple Watch Series 6 - 40mm"

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
fail_ci_if_error: true

carthage_archive:
name: Carthage Archive on Xcode ${{ matrix.xcode }}
runs-on: macos-latest
strategy:
matrix:
xcode:
- '12.4'
- "12.4"
steps:
- uses: actions/checkout@v2

Expand All @@ -107,7 +153,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
swift: ['5.0', '5.1', '5.2', '5.3']
swift: ["5.3", "5.4"]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 0 additions & 2 deletions .github/xcode-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ workflows:
strategy:
matrix:
xcode:
- last-major
- latest
- latest-beta
xcode_tests:
strategy:
matrix:
xcode:
- last-major
- latest
- latest-beta
carthage_archive:
Expand Down
4 changes: 2 additions & 2 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Quick"
github "Quick/Nimble"
github "JosephDuffy/Quick" "main"
github "JosephDuffy/Nimble" "master"
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Nimble" "v8.1.2"
github "Quick/Quick" "v2.2.1"
github "JosephDuffy/Nimble" "643cef232fd2ec7c0f7426cca832f86d2daf5b40"
github "JosephDuffy/Quick" "2556e761cdcd96e7b4d8dbc1c2b404f409503258"
34 changes: 26 additions & 8 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
// swift-tools-version:5.0
// swift-tools-version:5.3
import PackageDescription

let package = Package(
name: "Partial",
platforms: [
.macOS(.v10_10), .iOS(.v8), .tvOS(.v9), .watchOS(.v2),
.macOS(.v10_10), .iOS(.v9), .tvOS(.v9), .watchOS(.v2),
],
products: [
.library(name: "Partial", targets: ["Partial"]),
],
dependencies: [
.package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
.package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
.package(url: "https://github.com/JosephDuffy/Quick.git", .branch("main")),
.package(url: "https://github.com/JosephDuffy/Nimble.git", .branch("master")),
],
targets: [
.target(name: "Partial"),
.testTarget(name: "PartialTests", dependencies: ["Partial", "Quick", "Nimble"]),
],
swiftLanguageVersions: [.v5]
]
)
21 changes: 0 additions & 21 deletions Package@swift-5.2.swift

This file was deleted.

21 changes: 0 additions & 21 deletions Package@swift-5.3.swift

This file was deleted.

Loading