Browse Source

Reverted .swift-version.
Included CI.sh with "swift package" fix.

Michael Ledin 9 years ago
parent
commit
f5ff7320d6
3 changed files with 42 additions and 2 deletions
  1. 1 1
      .swift-version
  2. 1 1
      .travis.yml
  3. 40 0
      CI.sh

+ 1 - 1
.swift-version

@@ -1 +1 @@
-3.0-dev
+3.0

+ 1 - 1
.travis.yml

@@ -8,4 +8,4 @@ osx_image: xcode8
 install:
     - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
 script:
-    - bash <(curl -s https://raw.githubusercontent.com/PlanTeam/Tools/master/CI.sh)
+    - CI.sh

+ 40 - 0
CI.sh

@@ -0,0 +1,40 @@
+#!/bin/bash -ex
+
+echo "Build script running as user $(whoami) in directory $(pwd)"
+
+if [ -e "/usr/local/bin/swiftenv" ]; then
+	export PATH="/usr/local/bin:$PATH"
+fi
+
+eval "$(swiftenv init -)"
+
+swiftenv version
+
+swift build --clean dist
+swift package fetch
+
+if [ -d Packages ]; then
+	if ls Packages/*/Tests 1>/dev/null 2>&1; then
+		echo "Deleting subpackage tests"
+		rm -r Packages/*/Tests
+	fi
+fi
+
+swift build
+sbexit=$?
+
+echo "Swift build exited with code $sbexit"
+
+if [[ $sbexit != 0 ]]; then
+	exit $sbexit
+fi
+
+if [ -e "Tools/testprep.sh" ]; then
+	cd Tools
+	./testprep.sh
+	cd ..
+fi
+
+if [ -d "Tests" ]; then
+	swift test
+fi