Skip to content
This repository has been archived by the owner on Aug 29, 2022. It is now read-only.

Commit

Permalink
Rework CI; run for both Swift 4.0 and 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
zwaldowski committed Apr 28, 2018
1 parent cf9d96f commit 36a444e
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 32 deletions.
6 changes: 3 additions & 3 deletions .fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ end
platform :mac do
desc "Test using Swift Package Manager for macOS and Linux"
lane :test do
sh "swift test"
sh "swift test --parallel"
end

desc "Validate we can build with Playgrounds compatibility code"
Expand All @@ -46,7 +46,7 @@ platform :mac do
build_for_playgrounds

# Note: Coupling to Travis here is not great!
if is_ci && ENV['TRAVIS_PULL_REQUEST'] == "false" && git_branch == "master"
if is_ci && ENV['TRAVIS_PULL_REQUEST'] == "false" && ensure_git_branch
publish_docs
end
end
Expand All @@ -60,7 +60,7 @@ platform :ios do

desc "Build using Xcode for tvOS and watchOS"
private_lane :build_for_other_platforms do
xcodebuild(scheme: "TVDeferred", destination: "platform=tvOS Simulator,name=Apple TV 1080p")
xcodebuild(scheme: "TVDeferred", destination: "platform=tvOS Simulator,name=Apple TV")
xcodebuild(scheme: "NanoDeferred", destination: "platform=watchOS Simulator,name=Apple Watch - 42mm")
end

Expand Down
38 changes: 27 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,41 @@
language: objective-c
os: osx
osx_image: xcode9
rvm:
- 2.4.2
install:
- bundle install --quiet
matrix:
include:
- env: JOB=macOS
os: osx
osx_image: xcode9.2
language: objective-c
install: bundle install --quiet
script: bundle exec fastlane mac ci
- env: JOB=iOS
os: osx
osx_image: xcode9.3
language: objective-c
install: bundle install --quiet
script: bundle exec fastlane ios ci
after_failure:
- cat ~/Library/Developer/Xcode/DerivedData/Deferred-*/Logs/Test/*/Session-MobileDeferredTests-*.log | true
- cat ~/Library/Logs/scan/Deferred-*.log | true
- language: generic
- env: JOB=Linux SWIFT=4.0
os: linux
dist: trusty
sudo: required
env: JOB=Linux
install: eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
script: swift test
language: generic
install:
- echo "4.0" > .swift-version
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
script:
- swift --version
- swift test --parallel
- env: JOB=Linux SWIFT=4.1
os: linux
dist: trusty
sudo: required
language: generic
install:
- echo "4.1" > .swift-version
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
script:
- swift --version
- swift test --parallel
notifications:
email: false
38 changes: 20 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ GEM
atomos (0.1.2)
babosa (1.0.2)
claide (1.0.2)
cocoapods (1.4.0)
cocoapods (1.5.0)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.4.0)
cocoapods-core (= 1.5.0)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.1.3, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
Expand All @@ -27,16 +27,16 @@ GEM
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
gh_inspector (~> 1.0)
molinillo (~> 0.6.4)
molinillo (~> 0.6.5)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.4, < 2.0)
cocoapods-core (1.4.0)
xcodeproj (>= 1.5.7, < 2.0)
cocoapods-core (1.5.0)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.1.3)
cocoapods-downloader (1.2.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
Expand All @@ -52,27 +52,29 @@ GEM
concurrent-ruby (1.0.5)
declarative (0.0.10)
declarative-option (0.1.0)
domain_name (0.5.20170404)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.2.1)
dotenv (2.4.0)
emoji_regex (0.1.1)
escape (0.0.4)
excon (0.62.0)
faraday (0.14.0)
faraday (0.15.0)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.1)
fastlane (2.88.0)
fastlane (2.93.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 2.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (~> 0.1)
excon (>= 0.45.0, < 1.0.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
Expand All @@ -90,7 +92,7 @@ GEM
public_suffix (~> 2.0.0)
rubyzip (>= 1.1.0, < 2.0.0)
security (= 0.1.3)
simctl (~> 1.6)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
Expand Down Expand Up @@ -125,7 +127,7 @@ GEM
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jazzy (0.9.1)
jazzy (0.9.2)
cocoapods (~> 1.0)
mustache (~> 0.99)
open4
Expand All @@ -147,12 +149,12 @@ GEM
mime-types-data (3.2016.0521)
mini_magick (4.5.1)
minitest (5.11.3)
molinillo (0.6.4)
molinillo (0.6.5)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
mustache (0.99.8)
nanaimo (0.2.4)
nanaimo (0.2.5)
nap (1.1.0)
naturally (2.1.0)
netrc (0.11.0)
Expand All @@ -172,7 +174,7 @@ GEM
rouge (2.0.7)
ruby-macho (1.1.0)
rubyzip (1.2.1)
sass (3.5.5)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -184,7 +186,7 @@ GEM
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.2)
simctl (1.6.4)
CFPropertyList
naturally
slack-notifier (2.3.2)
Expand All @@ -203,7 +205,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
unicode-display_width (1.3.2)
word_wrap (1.0.0)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
Expand Down

0 comments on commit 36a444e

Please sign in to comment.