Skip to content

Commit

Permalink
getting closer to original config
Browse files Browse the repository at this point in the history
  • Loading branch information
jonblatho authored Jul 24, 2018
1 parent 1135108 commit a50823d
Showing 1 changed file with 27 additions and 42 deletions.
69 changes: 27 additions & 42 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,60 +1,45 @@
os:
- osx
- linux
- osx
- linux
osx_image: xcode9.4
script: swift build
language: generic
sudo: required
dist: trusty

env:
global:
- SWIFT_VERSION=4.1.2
matrix:
- SWIFTPM_BUILD=true
- SWIFTPM_TEST=true
- XCODE_TEST_SDK=macosx
- XCODE_BUILD_SDK=iphonesimulator
- XCODE_BUILD_SDK=appletvsimulator
- XCODE_BUILD_SDK=watchsimulator

install:
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
script:
- swift build

# os:
# - osx
# - linux
# osx_image: xcode9
# language: generic
# sudo: required
# dist: trusty
# env:
# matrix:
# - SWIFTPM_BUILD=true
# - SWIFTPM_TEST=true
# - XCODE_TEST_SDK=macosx
# - XCODE_BUILD_SDK=iphonesimulator
# - XCODE_BUILD_SDK=appletvsimulator
# - XCODE_BUILD_SDK=watchsimulator

# matrix:
# exclude:
matrix:
exclude:
# # No need to build and test on macOS
# - os: osx
# env: SWIFTPM_BUILD=true
# # LinuxMain.swift is out of sync
# - os: linux
# env: SWIFTPM_TEST=true
# - os: linux
# env: XCODE_TEST_SDK=macosx
# - os: linux
# env: XCODE_BUILD_SDK=iphonesimulator
# - os: linux
# env: XCODE_BUILD_SDK=appletvsimulator
# - os: linux
# env: XCODE_BUILD_SDK=watchsimulator
- os: linux
env: XCODE_TEST_SDK=macosx
- os: linux
env: XCODE_BUILD_SDK=iphonesimulator
- os: linux
env: XCODE_BUILD_SDK=appletvsimulator
- os: linux
env: XCODE_BUILD_SDK=watchsimulator

# install:
# - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
install:
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"

# script:
# - if [ -n "$SWIFTPM_BUILD" ]; then swift build; fi
# - if [ -n "$SWIFTPM_TEST" ]; then swift test; fi
# - if [ -n "$XCODE_BUILD_SDK" ] || [ -n "$XCODE_TEST_SDK" ]; then swift package generate-xcodeproj; fi
# - if [ -n "$XCODE_BUILD_SDK" ]; then xcodebuild -project JWT.xcodeproj -scheme JWT-Package build -sdk $XCODE_BUILD_SDK; fi
# - if [ -n "$XCODE_TEST_SDK" ]; then xcodebuild -project JWT.xcodeproj -scheme JWT-Package test -sdk $XCODE_TEST_SDK; fi
script:
- if [ -n "$SWIFTPM_BUILD" ]; then swift build; fi
- if [ -n "$SWIFTPM_TEST" ]; then swift test; fi
- if [ -n "$XCODE_BUILD_SDK" ] || [ -n "$XCODE_TEST_SDK" ]; then swift package generate-xcodeproj; fi
- if [ -n "$XCODE_BUILD_SDK" ]; then xcodebuild -project JWT.xcodeproj -scheme JWT-Package build -sdk $XCODE_BUILD_SDK; fi
- if [ -n "$XCODE_TEST_SDK" ]; then xcodebuild -project JWT.xcodeproj -scheme JWT-Package test -sdk $XCODE_TEST_SDK; fi

0 comments on commit a50823d

Please sign in to comment.