Skip to content

Commit

Permalink
[ci] Xcode 10.1; Linux Swift 4.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mxcl committed Nov 7, 2018
1 parent 289b6a8 commit e9db9cf
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
osx_image: xcode9.4 osx_image: xcode9.4
name: Carthage / Xcode 9.4 name: Carthage / Xcode 9.4
- <<: *carthage - <<: *carthage
osx_image: xcode10 osx_image: xcode10.1
name: Carthage / Xcode 10.0 name: Carthage / Xcode 10.0


- &pod - &pod
Expand All @@ -46,7 +46,7 @@ jobs:
env: SWIFT=3.3 env: SWIFT=3.3
name: pod lib lint --swift-version=3.3 name: pod lib lint --swift-version=3.3
- <<: *pod - <<: *pod
osx_image: xcode10 osx_image: xcode10.1
env: SWIFT=3.4 env: SWIFT=3.4
name: pod lib lint --swift-version=3.4 name: pod lib lint --swift-version=3.4
- <<: *pod - <<: *pod
Expand All @@ -58,7 +58,7 @@ jobs:
env: SWIFT=4.1 env: SWIFT=4.1
name: pod lib lint --swift-version=4.1 name: pod lib lint --swift-version=4.1
- <<: *pod - <<: *pod
osx_image: xcode10 osx_image: xcode10.1
env: SWIFT=4.2 env: SWIFT=4.2
name: pod lib lint --swift-version=4.2 name: pod lib lint --swift-version=4.2


Expand All @@ -77,7 +77,7 @@ jobs:
env: SWIFT_BUILD_VERSION=3 SWIFT_VERSION=4.1.2 env: SWIFT_BUILD_VERSION=3 SWIFT_VERSION=4.1.2
name: Linux / Swift 3.3 name: Linux / Swift 3.3
- <<: *linux - <<: *linux
env: SWIFT_BUILD_VERSION=3 SWIFT_VERSION=4.2 env: SWIFT_BUILD_VERSION=3 SWIFT_VERSION=4.2.1
name: Linux / Swift 3.4 name: Linux / Swift 3.4
- <<: *linux - <<: *linux
env: SWIFT_BUILD_VERSION=4 SWIFT_VERSION=4.0.3 env: SWIFT_BUILD_VERSION=4 SWIFT_VERSION=4.0.3
Expand All @@ -88,7 +88,7 @@ jobs:
env: SWIFT_BUILD_VERSION=4 SWIFT_VERSION=4.1.2 env: SWIFT_BUILD_VERSION=4 SWIFT_VERSION=4.1.2
name: Linux / Swift 4.1 name: Linux / Swift 4.1
- <<: *linux - <<: *linux
env: SWIFT_BUILD_VERSION=4 SWIFT_VERSION=4.2 env: SWIFT_BUILD_VERSION=4 SWIFT_VERSION=4.2.1
name: Linux / Swift 4.2 name: Linux / Swift 4.2
stage: test stage: test
script: swift test -Xswiftc -swift-version -Xswiftc 4 script: swift test -Xswiftc -swift-version -Xswiftc 4
Expand Down Expand Up @@ -121,25 +121,25 @@ jobs:
xcodebuild -scheme PromiseKit -destination="$DST" -enableCodeCoverage YES SWIFT_VERSION=4 test | xcpretty xcodebuild -scheme PromiseKit -destination="$DST" -enableCodeCoverage YES SWIFT_VERSION=4 test | xcpretty
- <<: *test - <<: *test
name: macOS / Xcode 10.0 name: macOS / Xcode 10.0
osx_image: xcode10 osx_image: xcode10.1
script: script:
xcodebuild -scheme PromiseKit -destination="$DST" -enableCodeCoverage YES SWIFT_VERSION=4 test | xcpretty xcodebuild -scheme PromiseKit -destination="$DST" -enableCodeCoverage YES SWIFT_VERSION=4 test | xcpretty


- <<: *test - <<: *test
name: iOS / Xcode 10.0 name: iOS / Xcode 10.0
osx_image: xcode10 osx_image: xcode10.1
env: DST='OS=12.0,name=iPhone SE' env: DST='OS=12.0,name=iPhone SE'


- <<: *test - <<: *test
name: tvOS / Xcode 10.0 name: tvOS / Xcode 10.0
env: DST='OS=12.0,name=Apple TV' env: DST='OS=12.0,name=Apple TV'
osx_image: xcode10 osx_image: xcode10.1


- stage: test - stage: test
name: Promises/A+ (via WebKit JavaScript Bridge) name: Promises/A+ (via WebKit JavaScript Bridge)
language: objective-c language: objective-c
os: osx os: osx
osx_image: xcode10 osx_image: xcode10.1
before_install: | before_install: |
set -eo pipefail set -eo pipefail
npm install -g npm npm install -g npm
Expand All @@ -162,7 +162,7 @@ jobs:
osx_image: xcode9.4 osx_image: xcode9.4
script: swift build script: swift build
- <<: *swiftpm - <<: *swiftpm
osx_image: xcode10 osx_image: xcode10.1
name: SwiftPM / macOS / Xcode 10.0 name: SwiftPM / macOS / Xcode 10.0


- stage: deploy - stage: deploy
Expand All @@ -173,5 +173,5 @@ jobs:
# AND `pod` defaults to hardly any output # AND `pod` defaults to hardly any output
# BUT `--verbose` generates so much output that Travis kills our script due to *too much* output! # BUT `--verbose` generates so much output that Travis kills our script due to *too much* output!
os: osx os: osx
osx_image: xcode10 osx_image: xcode10.1
language: objective-c language: objective-c
28 changes: 28 additions & 0 deletions PromiseKit copy-Info.plist
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
</dict>
</plist>
28 changes: 28 additions & 0 deletions PromiseKit copy2-Info.plist
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
</dict>
</plist>

0 comments on commit e9db9cf

Please sign in to comment.