|
8 | 8 | depth: 2
|
9 | 9 |
|
10 | 10 | language: cpp
|
11 |
| -os: |
12 |
| - - linux |
13 |
| - - osx |
14 |
| -osx_image: xcode9.1 |
| 11 | +os: linux |
| 12 | + |
15 | 13 | compiler:
|
16 | 14 | - gcc
|
17 | 15 | - clang
|
18 | 16 |
|
19 | 17 | cache:
|
20 | 18 | apt: true
|
21 | 19 | ccache: true
|
22 |
| - directories: |
23 |
| - - /usr/local/Cellar |
24 | 20 |
|
25 | 21 | env:
|
26 | 22 | matrix:
|
27 |
| -# - GCC_VERSION=4.8 TYPE=Debug MYSQL_TEST_SUITES=rpl |
28 |
| -# - GCC_VERSION=5 TYPE=Debug MYSQL_TEST_SUITES=main,archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts |
29 |
| -# - GCC_VERSION=6 TYPE=Debug MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb |
30 |
| -# - GCC_VERSION=6 TYPE=Debug MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,percona,perfschema,plugins,multi_source,roles |
31 | 23 | - GCC_VERSION=4.8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
|
32 | 24 | - GCC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main,archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts
|
33 | 25 | - GCC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb
|
34 | 26 | - GCC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,percona,perfschema,plugins,multi_source,roles
|
35 | 27 |
|
36 | 28 | matrix:
|
37 | 29 | exclude:
|
38 |
| - - os: osx |
39 |
| - compiler: gcc |
| 30 | + - compiler: clang |
| 31 | + env: GCC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main,archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts |
40 | 32 | include:
|
41 | 33 | - os: linux
|
42 | 34 | compiler: gcc
|
@@ -87,51 +79,6 @@ matrix:
|
87 | 79 | - export MTR_MEM=/tmp
|
88 | 80 | - env DEB_BUILD_OPTIONS="parallel=6" debian/autobake-deb.sh;
|
89 | 81 | - ccache --show-stats
|
90 |
| - # Until OSX becomes a bit more stable: MDEV-12435 |
91 |
| - allow_failures: |
92 |
| - - os: osx |
93 |
| - compiler: clang |
94 |
| - env: GCC_VERSION=4.8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl |
95 |
| - - os: osx |
96 |
| - compiler: clang |
97 |
| - env: GCC_VERSION=5 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main,archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts |
98 |
| - - os: osx |
99 |
| - compiler: clang |
100 |
| - env: GCC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb |
101 |
| - - os: osx |
102 |
| - compiler: clang |
103 |
| - env: GCC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,percona,perfschema,plugins,multi_source,roles |
104 |
| - |
105 |
| -# Matrix include for coverity |
106 |
| -# - env: |
107 |
| -# - GCC_VERSION=6 |
108 |
| -# addon: |
109 |
| -# coverity_scan: |
110 |
| -# # ref: https://scan.coverity.com/travis_ci |
111 |
| -# # GitHub project metadata |
112 |
| -# project: |
113 |
| -# - name: MariaDB/server |
114 |
| -# - description: MariaDB Server |
115 |
| -# |
116 |
| -# # Where email notification of build analysis results will be sent |
117 |
| -# notification_email: security@mariadb.org |
118 |
| -# |
119 |
| -# # Commands to prepare for build_command |
120 |
| -# build_command_prepend: |
121 |
| -# - source .travis.compiler.sh |
122 |
| -# - ${MYSQL_BUILD_CC} --version ; ${MYSQL_BUILD_CXX} --version |
123 |
| -# - cmake . |
124 |
| -# -DCMAKE_BUILD_TYPE=Debug |
125 |
| -# -DWITH_SSL=system -DWITH_ZLIB=system |
126 |
| -# -DWITHOUT_TOKUDB_STORAGE_ENGINE=ON -DWITHOUT_MROONGA_STORAGE_ENGINE=ON |
127 |
| -# |
128 |
| -# # The command that will be added as an argument to "cov-build" to compile your project for analysis, |
129 |
| -# build_command: make -j 4 |
130 |
| -# |
131 |
| -# # Pattern to match selecting branches that will run analysis. |
132 |
| -# # Take care in resource usage, and consider the build frequency allowances per |
133 |
| -# # https://scan.coverity.com/faq#frequency - 7 per week is the current limit. |
134 |
| -# branch_pattern: .*coverity.* |
135 | 82 |
|
136 | 83 | addons:
|
137 | 84 | apt:
|
@@ -178,15 +125,6 @@ addons:
|
178 | 125 | - libzmq-dev
|
179 | 126 | - uuid-dev
|
180 | 127 |
|
181 |
| -# libsystemd-daemon-dev # https://github.com/travis-ci/apt-package-whitelist/issues/3882 |
182 |
| - |
183 |
| -before_install: |
184 |
| - - if [[ "${TRAVIS_OS_NAME}" == 'osx' ]]; then |
185 |
| - brew update; |
186 |
| - brew install gnutls lz4 lzo xz snappy ccache jemalloc curl ossp-uuid pcre; |
187 |
| - brew link ccache; |
188 |
| - fi |
189 |
| - |
190 | 128 | script:
|
191 | 129 | - ccache --version
|
192 | 130 | # Clang:
|
|
0 commit comments