Skip to content
This repository was archived by the owner on Oct 23, 2023. It is now read-only.

Commit 360de11

Browse files
committed
Reenabled linux builds and implemented release for osx
1 parent 9408113 commit 360de11

File tree

1 file changed

+73
-64
lines changed

1 file changed

+73
-64
lines changed

.travis.yml

+73-64
Original file line numberDiff line numberDiff line change
@@ -4,64 +4,64 @@ sudo: required
44

55
matrix:
66
include:
7-
# - os: linux
8-
# addons:
9-
# apt:
10-
# sources:
11-
# - ubuntu-toolchain-r-test
12-
# - sourceline: "ppa:jonathonf/python-3.6"
13-
# packages:
14-
# - g++-4.9
15-
# - git
16-
# - make
17-
# - python3.6
18-
# - python3.6-dev
19-
# - wget
20-
# # only for tests
21-
# - rustc
22-
# # needed for the release
23-
# - zip
24-
# env:
25-
# - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
26-
#
27-
# - os: linux
28-
# addons:
29-
# apt:
30-
# sources:
31-
# - ubuntu-toolchain-r-test
32-
# - sourceline: "ppa:jonathonf/python-3.6"
33-
# packages:
34-
# - g++-7
35-
# - git
36-
# - make
37-
# - python3.6
38-
# - python3.6-dev
39-
# - wget
40-
# # only for tests
41-
# - rustc
42-
# env:
43-
# - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
44-
#
45-
# - os: linux
46-
# addons:
47-
# apt:
48-
# sources:
49-
# - ubuntu-toolchain-r-test
50-
# - llvm-toolchain-precise-3.6
51-
# - sourceline: "ppa:jonathonf/python-3.6"
52-
# packages:
53-
# - libstdc++-4.9-dev
54-
# - clang-3.6
55-
# - git
56-
# - make
57-
# - python3.6
58-
# - python3.6-dev
59-
# - wget
60-
# # only for tests
61-
# - rustc
62-
# env:
63-
# - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
64-
#
7+
- os: linux
8+
addons:
9+
apt:
10+
sources:
11+
- ubuntu-toolchain-r-test
12+
- sourceline: "ppa:jonathonf/python-3.6"
13+
packages:
14+
- g++-4.9
15+
- git
16+
- make
17+
- python3.6
18+
- python3.6-dev
19+
- wget
20+
# only for tests
21+
- rustc
22+
# needed for the release
23+
- zip
24+
env:
25+
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9 && DEPLOY=1"
26+
27+
- os: linux
28+
addons:
29+
apt:
30+
sources:
31+
- ubuntu-toolchain-r-test
32+
- sourceline: "ppa:jonathonf/python-3.6"
33+
packages:
34+
- g++-7
35+
- git
36+
- make
37+
- python3.6
38+
- python3.6-dev
39+
- wget
40+
# only for tests
41+
- rustc
42+
env:
43+
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
44+
45+
- os: linux
46+
addons:
47+
apt:
48+
sources:
49+
- ubuntu-toolchain-r-test
50+
- llvm-toolchain-precise-3.6
51+
- sourceline: "ppa:jonathonf/python-3.6"
52+
packages:
53+
- libstdc++-4.9-dev
54+
- clang-3.6
55+
- git
56+
- make
57+
- python3.6
58+
- python3.6-dev
59+
- wget
60+
# only for tests
61+
- rustc
62+
env:
63+
- MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
64+
6565
- os: linux
6666
addons:
6767
apt:
@@ -86,6 +86,8 @@ matrix:
8686
before_install:
8787
- brew upgrade python wget cmake
8888
- brew install rust
89+
env:
90+
- MATRIX_EVAL="DEPLOY=1"
8991

9092

9193
cache:
@@ -132,18 +134,25 @@ after_success:
132134
before_deploy:
133135
- cmake -H. -Bbuild_rel -DHUNTER_ROOT=hunter-root -DCMAKE_BUILD_TYPE=Release
134136
- cmake --build build_rel
135-
- strip -s build_rel/python/task_maker/bin/manager
136-
- strip -s build_rel/python/task_maker/bin/server
137-
- strip -s build_rel/python/task_maker/bin/worker
137+
- |
138+
if [ $TRAVIS_OS_NAME == "linux" ]; then
139+
strip -s build_rel/python/task_maker/bin/manager
140+
strip -s build_rel/python/task_maker/bin/server
141+
strip -s build_rel/python/task_maker/bin/worker
142+
else
143+
strip build_rel/python/task_maker/bin/manager
144+
strip build_rel/python/task_maker/bin/server
145+
strip build_rel/python/task_maker/bin/worker
146+
fi
138147
- chmod +x build_rel/python/setup.py
139-
- ( cd build_rel/python && zip -r task-maker-$TRAVIS_TAG.zip requirements.txt setup.py task_maker )
148+
- ( cd build_rel/python && zip -r task-maker-$TRAVIS_TAG-$TRAVIS_OS_NAME.zip requirements.txt setup.py task_maker )
140149

141150
deploy:
142151
provider: releases
143152
api_key:
144153
secure: HVF8CkBTelG3qd0R9D8ODEwzYcwU8Sk7wKZ5vDTZajdqSFcHllJfY8UUBJQ2iXH1a2Q9vFqcbd+O44mvKyk/6KGg5xfoxgo4SQvXqvQ/s9AsrMEEOOT/++MMwDEZM6NCSL6CvoH9EOGRw6Dd+XEgS2EiotgvvTi3W9oeq3/qt7UqPqxVgTcqY4ZdIsEHDwPcjcd/B8YZ9G4aq/gRWHoS9OD5exfsMWd+FbN/BD00QJxzVz96IrPXu80d7HpTis34ROO1D+tSBNBqTovfHwTa1A99LLygismY70BofXwrxuanFQH4Jq3kXvMnmZCHFYFqdAw2k5y49yJTwlkf4gmwXQXDfHsos+fSdm5xmuEpUT2asW+riWYcyQ9s0ygZx7FBa3fgamiBSxaP5ogwWX2k41IqV/nPp5S9uATaquyBgSTEQga6xQP68+1igpWi/na77DkH3QS3Fa4UMs6Lef1QTiUkNDSXwdLXV0ljrr3wye6vqz1g6C9/7lPF3Nm5uDy/mYjqZdF/H2mjg+G9smEkSI1/xciDJaTZRxly+SEZRoo1FX7Gk0e58EDgCXHI7Kb8X7ju82hHFpCIgzqDbfxAnmWujBRhy4Qka2wHnezAKOOu7zWqpDUPabcMXg/6eMWtj5h63YAXsalrkYwV4gtyzhOmtICT4MfhzzU0/DmU84U=
145-
file: build_rel/python/task-maker-$TRAVIS_TAG.zip
154+
file: build_rel/python/task-maker-$TRAVIS_TAG-$TRAVIS_OS_NAME.zip
146155
skip_cleanup: true
147156
on:
148157
tags: true
149-
condition: "$CC = gcc-4.9"
158+
condition: "$DEPLOY = 1"

0 commit comments

Comments
 (0)