[Travis CI] Test on Swift 2.2

This commit is contained in:
Kyle Fuller
2016-06-07 09:56:53 -07:00
parent 80427a51e6
commit df650c6b20
11 changed files with 12 additions and 16 deletions

View File

@@ -1 +1 @@
DEVELOPMENT-SNAPSHOT-2016-01-25-a
2.2

View File

@@ -1,11 +1,14 @@
os:
- osx
- linux
env:
- SWIFT_VERSION=2.2
language: generic
sudo: required
dist: trusty
osx_image: xcode7.2
osx_image: xcode7.3
install:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo python -m ensurepip; fi
- sudo pip install swim
script:
- make test
- swim test

View File

@@ -1,7 +0,0 @@
stencil:
@echo "Building Stencil"
@swift build
test: stencil
@echo "Running Tests"
@.build/debug/spectre-build

View File

@@ -6,6 +6,6 @@ let package = Package(
.Package(url: "https://github.com/kylef/PathKit.git", majorVersion: 0, minor: 6),
],
testDependencies: [
.Package(url: "https://github.com/kylef/spectre-build", majorVersion: 0),
.Package(url: "https://github.com/kylef/Spectre.git", majorVersion: 0),
]
)

View File

@@ -5,7 +5,7 @@ import PathKit
func testInclude() {
describe("Include") {
let path = Path(__FILE__) + ".." + ".." + "fixtures"
let path = Path(__FILE__) + ".." + "fixtures"
let loader = TemplateLoader(paths: [path])
$0.describe("parsing") {

View File

@@ -5,7 +5,7 @@ import PathKit
func testInheritence() {
describe("Inheritence") {
let path = Path(__FILE__) + ".." + ".." + "fixtures"
let path = Path(__FILE__) + ".." + "fixtures"
let loader = TemplateLoader(paths: [path])
$0.it("can inherit from another template") {

View File

@@ -5,7 +5,7 @@ import PathKit
func testTemplateLoader() {
describe("TemplateLoader") {
let path = Path(__FILE__) + ".." + ".." + "Tests" + "fixtures"
let path = Path(__FILE__) + ".." + "fixtures"
let loader = TemplateLoader(paths: [path])
$0.it("returns nil when a template cannot be found") {