Skip to content

Commit 94105e3

Browse files
committed
Merge pull request #19 from ypopovych/develop
Configs for reactive-swift
2 parents d5bd17b + 5311345 commit 94105e3

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

.travis.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ matrix:
3131
file: $MODULE_NAME.framework.zip
3232
skip_cleanup: true
3333
on:
34-
repo: crossroadlabs/ExecutionContext
34+
repo: reactive-swift/ExecutionContext
3535
tags: true
3636
- script:
3737
- ./build test
38-
- ./build clean
39-
- ./build test -Xcc -fblocks -Xswiftc -Ddispatch
38+
#- ./build clean
39+
#- ./build test -Xcc -fblocks -Xswiftc -Ddispatch
4040
sudo: required
4141
dist: trusty
4242
language: generic
@@ -50,15 +50,15 @@ matrix:
5050
- export SWIFT_ROOT_DIR="${PWD}/${SWIFT_VERSION}-ubuntu14.04"
5151
- export PATH="${SWIFT_ROOT_DIR}/usr/bin:${PATH}"
5252
# dispatch build
53-
- sudo apt-get install clang autoconf libtool pkg-config systemtap-sdt-dev libblocksruntime-dev libkqueue-dev libpthread-workqueue-dev libbsd-dev git make
54-
- git clone -b experimental/foundation https://github.com/apple/swift-corelibs-libdispatch.git
55-
- cd swift-corelibs-libdispatch
56-
- git submodule init
57-
- git submodule update
58-
- sh ./autogen.sh
59-
- ./configure --with-swift-toolchain="${SWIFT_ROOT_DIR}/usr" --prefix="${SWIFT_ROOT_DIR}/usr"
60-
- make && make install
61-
- cd ..
53+
#- sudo apt-get install clang autoconf libtool pkg-config systemtap-sdt-dev libblocksruntime-dev libkqueue-dev libpthread-workqueue-dev libbsd-dev git make
54+
#- git clone -b experimental/foundation https://github.com/apple/swift-corelibs-libdispatch.git
55+
#- cd swift-corelibs-libdispatch
56+
#- git submodule init
57+
#- git submodule update
58+
#- sh ./autogen.sh
59+
#- ./configure --with-swift-toolchain="${SWIFT_ROOT_DIR}/usr" --prefix="${SWIFT_ROOT_DIR}/usr"
60+
#- make && make install
61+
#- cd ..
6262
# libuv v1
6363
- sudo add-apt-repository ppa:swiftexpress/swiftexpress --yes
6464
- sudo apt-get update

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "antitypical/Result" ~> 2.0
22
github "crossroadlabs/Boilerplate" ~> 0.1
3-
github "crossroadlabs/RunLoop" "master"
3+
github "reactive-swift/RunLoop" "master"

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ let package = Package(
2323
.Package(url: "https://github.com/antitypical/Result.git", majorVersion: 2),
2424
.Package(url: "https://github.com/crossroadlabs/Boilerplate.git", majorVersion: 0, minor: 1),
2525
.Package(url: "https://github.com/crossroadlabs/XCTest3.git", majorVersion: 0, minor: 1),
26-
.Package(url: "https://github.com/crossroadlabs/RunLoop.git", majorVersion: 0, minor: 1),
26+
.Package(url: "https://github.com/reactive-swift/RunLoop.git", majorVersion: 0, minor: 1),
2727
]
2828
)

0 commit comments

Comments
 (0)