Skip to content

Commit 37f3038

Browse files
committed
Travis: use swift build
.. not `make all` ;-) Also: only execute install.sh stuff on Linux and install mod_swift using sudo.
1 parent 41d631e commit 37f3038

File tree

2 files changed

+37
-31
lines changed

2 files changed

+37
-31
lines changed

.travis.d/install.sh

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,55 @@
11
#!/bin/bash
22

3-
# our path is:
4-
# /home/travis/build/NozeIO/Noze.io/
3+
if [[ "$TRAVIS_OS_NAME" == "Linux" ]]; then
54

6-
# Install Swift
5+
# our path is:
6+
# /home/travis/build/NozeIO/Noze.io/
77

8-
wget "${SWIFT_SNAPSHOT_NAME}"
8+
# Install Swift
99

10-
TARBALL="`ls swift-*.tar.gz`"
11-
echo "Tarball: $TARBALL"
10+
wget "${SWIFT_SNAPSHOT_NAME}"
1211

13-
TARPATH="$PWD/$TARBALL"
12+
TARBALL="`ls swift-*.tar.gz`"
13+
echo "Tarball: $TARBALL"
1414

15-
cd $HOME # expand Swift tarball in $HOME
16-
tar zx --strip 1 --file=$TARPATH
17-
pwd
15+
TARPATH="$PWD/$TARBALL"
1816

19-
export PATH="$PWD/usr/bin:$PATH"
20-
which swift
17+
cd $HOME # expand Swift tarball in $HOME
18+
tar zx --strip 1 --file=$TARPATH
19+
pwd
20+
21+
export PATH="$PWD/usr/bin:$PATH"
22+
which swift
23+
24+
if [ `which swift` ]; then
25+
echo "Installed Swift: `which swift`"
26+
else
27+
echo "Failed to install Swift?"
28+
exit 42
29+
fi
30+
swift --version
2131

22-
if [ `which swift` ]; then
23-
echo "Installed Swift: `which swift`"
24-
else
25-
echo "Failed to install Swift?"
26-
exit 42
27-
fi
28-
swift --version
2932

33+
# Environment
3034

31-
# Environment
35+
TT_SWIFT_BINARY=`which swift`
3236

33-
TT_SWIFT_BINARY=`which swift`
37+
echo "${TT_SWIFT_BINARY}"
3438

35-
echo "${TT_SWIFT_BINARY}"
3639

40+
# Install mod_swift
3741

38-
# Install mod_swift
42+
wget "${MOD_SWIFT}" -O mod_swift.tar.gz
43+
tar zxf mod_swift.tar.gz
44+
cd mod_swift-*
45+
make all
46+
sudo make install
3947

40-
wget "${MOD_SWIFT}" -O mod_swift.tar.gz
41-
tar zxf mod_swift.tar.gz
42-
cd mod_swift-*
43-
make all
44-
make install
48+
swift apache validate
4549

46-
swift apache validate
4750

51+
# Go back somewhere
4852

49-
cd $HOME
53+
cd $HOME
54+
55+
fi

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ install:
2424

2525
script:
2626
- export PATH="$HOME/usr/bin:$PATH"
27-
- make all
27+
- swift build

0 commit comments

Comments
 (0)