Skip to content

Commit 14715c9

Browse files
committed
Travis: Update build envs
Build against 4.2/5 and w/ the newer mod_swift.
1 parent e293b7a commit 14715c9

File tree

5 files changed

+11
-19
lines changed

5 files changed

+11
-19
lines changed

.travis.d/before-install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
if [[ "$TRAVIS_OS_NAME" == "Linux" ]]; then
3+
if [[ "$TRAVIS_OS_NAME" == "Linux" || "$TRAVIS_OS_NAME" == "linux" ]]; then
44
sudo apt-get install -y wget \
55
clang-3.6 libc6-dev make git libicu52 libicu-dev \
66
git autoconf libtool pkg-config \

.travis.d/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
if [[ "$TRAVIS_OS_NAME" == "Linux" ]]; then
3+
if [[ "$TRAVIS_OS_NAME" == "Linux" || "$TRAVIS_OS_NAME" == "linux" ]]; then
44

55
# our path is:
66
# /home/travis/build/NozeIO/Noze.io/

.travis.yml

+6-16
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,22 @@
11
language: generic
22

33
notifications:
4-
slack: nozeio:LIFY1Jtkx0FRcLq3u1WliHRZ
4+
slack:
5+
rooms:
6+
- zeeql:odi4PEJUdmDPkBfjhHIaSdrS
57

68
matrix:
79
include:
810
- os: Linux
911
dist: trusty
10-
env: MOD_SWIFT="https://github.com/modswift/mod_swift/archive/0.8.11.tar.gz" SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-3.1.1-release/ubuntu1404/swift-3.1.1-RELEASE/swift-3.1.1-RELEASE-ubuntu14.04.tar.gz"
12+
env: MOD_SWIFT="https://github.com/modswift/mod_swift/archive/0.9.0.tar.gz" SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.2.4-release/ubuntu1404/swift-4.2.4-RELEASE/swift-4.2.4-RELEASE-ubuntu14.04.tar.gz"
1113
sudo: required
1214
- os: Linux
1315
dist: trusty
14-
env: MOD_SWIFT="https://github.com/modswift/mod_swift/archive/0.8.11.tar.gz" SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.0.3-release/ubuntu1404/swift-4.0.3-RELEASE/swift-4.0.3-RELEASE-ubuntu14.04.tar.gz"
16+
env: MOD_SWIFT="https://github.com/modswift/mod_swift/archive/0.9.0.tar.gz" SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-5.0.2-release/ubuntu1404/swift-5.0.2-RELEASE/swift-5.0.2-RELEASE-ubuntu14.04.tar.gz"
1517
sudo: required
16-
- os: Linux
17-
dist: trusty
18-
env: MOD_SWIFT="https://github.com/modswift/mod_swift/archive/0.8.11.tar.gz" SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.1-branch/ubuntu1404/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-02-07-a/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-02-07-a-ubuntu14.04.tar.gz"
19-
sudo: required
20-
- os: Linux
21-
dist: trusty
22-
env: MOD_SWIFT="https://github.com/modswift/mod_swift/archive/0.8.11.tar.gz" SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz"
23-
sudo: required
24-
- os: osx
25-
osx_image: xcode8.3
26-
- os: osx
27-
osx_image: xcode9
2818
- os: osx
29-
osx_image: xcode9.3
19+
osx_image: xcode10.2
3020

3121
before_install:
3222
- ./.travis.d/before-install.sh

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
</h2>
55

66
![Apache 2](https://img.shields.io/badge/apache-2-yellow.svg)
7-
![Swift4](https://img.shields.io/badge/swift-4-blue.svg)
7+
![Swift4.2](https://img.shields.io/badge/swift-4.2-blue.svg)
8+
![Swift5](https://img.shields.io/badge/swift-5-blue.svg)
89
![macOS](https://img.shields.io/badge/os-macOS-green.svg?style=flat)
910
![tuxOS](https://img.shields.io/badge/os-tuxOS-green.svg?style=flat)
1011
![Travis](https://travis-ci.org/ZeeQL/ZeeQL3Apache.svg?branch=develop)

xcconfig/Base.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ SWIFT_OPTIMIZATION_LEVEL_Debug = -Onone
5959
SWIFT_OPTIMIZATION_LEVEL = $(SWIFT_OPTIMIZATION_LEVEL_$(CONFIGURATION))
6060

6161
SWIFT_VERSION = 4.2
62+
//SWIFT_VERSION = 5
6263

6364

6465
// Deployment Targets

0 commit comments

Comments
 (0)