Skip to content

Commit c995090

Browse files
committed
Travis-CI: Remove builds that always fail to make CI useful again
Also clean away dead code that is not used and will never have any use on the 10.2 branch.
1 parent 8d056af commit c995090

File tree

1 file changed

+4
-66
lines changed

1 file changed

+4
-66
lines changed

.travis.yml

Lines changed: 4 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,27 @@ git:
88
depth: 2
99

1010
language: cpp
11-
os:
12-
- linux
13-
- osx
14-
osx_image: xcode9.1
11+
os: linux
12+
1513
compiler:
1614
- gcc
1715
- clang
1816

1917
cache:
2018
apt: true
2119
ccache: true
22-
directories:
23-
- /usr/local/Cellar
2420

2521
env:
2622
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
3123
- GCC_VERSION=4.8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
3224
- 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
3325
- GCC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption,rocksdb
3426
- 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
3527

3628
matrix:
3729
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
4032
include:
4133
- os: linux
4234
compiler: gcc
@@ -87,51 +79,6 @@ matrix:
8779
- export MTR_MEM=/tmp
8880
- env DEB_BUILD_OPTIONS="parallel=6" debian/autobake-deb.sh;
8981
- 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.*
13582

13683
addons:
13784
apt:
@@ -178,15 +125,6 @@ addons:
178125
- libzmq-dev
179126
- uuid-dev
180127

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-
190128
script:
191129
- ccache --version
192130
# Clang:

0 commit comments

Comments
 (0)