Skip to content

Correct some Linux-specific build issues #488

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

Merged
merged 3 commits into from
Jul 18, 2017
Merged

Correct some Linux-specific build issues #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67eabdc
Fix some Linux-specific build issues
liscio Jul 17, 2017
17a2d79
Add a Swift 4 job on Linux for CI
liscio Jul 17, 2017
d7eb8bc
Updating Darwin SPM testing snapshot
liscio Jul 17, 2017
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
18 changes: 18 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ jobs:
env:
- JOB=SWIFTPM_DARWIN
- osx_image: xcode9
before_install:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
script:
- swift --version
- swift build
Expand All @@ -92,6 +94,7 @@ jobs:
submodules: false
env:
- JOB=SWIFT_4
- SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2017-07-13-a
- os: linux
language: generic
sudo: required
Expand All @@ -105,6 +108,21 @@ jobs:
git:
submodules: false
env: JOB=SWIFTPM_LINUX
- os: linux
language: generic
sudo: required
dist: trusty
before_install:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
script:
- swift --version
- swift build
- SWIFTPM_TEST_ReactiveSwift=YES swift test
git:
submodules: false
env:
- JOB=SWIFTPM_SWIFT_4_LINUX
- SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2017-07-13-a
- stage: prepare carthage cache
script: carthage build --cache-builds
- stage: carthage
Expand Down
4 changes: 2 additions & 2 deletions Sources/FoundationExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ extension Date {

extension DispatchTimeInterval {
internal var timeInterval: TimeInterval {
#if swift(>=3.2)
#if swift(>=3.2) && !os(Linux)
switch self {
case let .seconds(s):
return TimeInterval(s)
Expand Down Expand Up @@ -117,7 +117,7 @@ extension DispatchTimeInterval {
// This was added purely so that our test scheduler to "go backwards" in
// time. See `TestScheduler.rewind(by interval: DispatchTimeInterval)`.
internal static prefix func -(lhs: DispatchTimeInterval) -> DispatchTimeInterval {
#if swift(>=3.2)
#if swift(>=3.2) && !os(Linux)
switch lhs {
case let .seconds(s):
return .seconds(-s)
Expand Down
4 changes: 2 additions & 2 deletions Tests/ReactiveSwiftTests/FoundationExtensionsSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class FoundationExtensionsSpec: QuickSpec {

expect(DispatchTimeInterval.milliseconds(500).timeInterval).to(beCloseTo(0.5))
expect(DispatchTimeInterval.milliseconds(250).timeInterval).to(beCloseTo(0.25))
#if swift(>=3.2)
#if swift(>=3.2) && !os(Linux)
expect(DispatchTimeInterval.never.timeInterval) == Double.infinity
#endif
}
Expand All @@ -113,7 +113,7 @@ class FoundationExtensionsSpec: QuickSpec {
expect((-DispatchTimeInterval.milliseconds(1)).timeInterval).to(beCloseTo(-0.001))
expect((-DispatchTimeInterval.microseconds(1)).timeInterval).to(beCloseTo(-0.000001, within: 0.0000001))
expect((-DispatchTimeInterval.nanoseconds(1)).timeInterval).to(beCloseTo(-0.000000001, within: 0.0000000001))
#if swift(>=3.2)
#if swift(>=3.2) && !os(Linux)
expect((-DispatchTimeInterval.never).timeInterval) == Double.infinity
#endif
}
Expand Down