Skip to content

Commit d5c3fdf

Browse files
authored
Merge pull request #70 from SingingBush/master
update Travis-CI build for recent versions of DMD and LDC
2 parents 7154517 + 928a7a0 commit d5c3fdf

File tree

3 files changed

+38
-32
lines changed

3 files changed

+38
-32
lines changed

.travis.yml

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,22 @@
11
language: d
22

3-
# See: https://docs.travis-ci.com/user/trusty-ci-environment/#Routing-to-Trusty
4-
sudo: required
5-
dist: trusty
6-
group: edge
7-
83
# start most recent dmd and ldc first, then older versions. (don't bother with pre-release')
94
# For available compilers see: https://semitwist.com/travis-d-compilers
105
d:
116
- ldc
127
- dmd
13-
- dmd-2.079.0
14-
- dmd-2.078.3
15-
- dmd-2.077.1
16-
- dmd-2.076.1
17-
- dmd-2.075.1
18-
- ldc-1.8.0 # eq to dmd v2.078.3
19-
- ldc-1.7.0 # eq to dmd v2.077.1
20-
- ldc-1.6.0 # eq to dmd v2.076.1
21-
- ldc-1.5.0 # eq to dmd v2.075.1
22-
- gdc
23-
24-
# make sure our Mac build uses latest OS X. See: https://docs.travis-ci.com/user/reference/osx/#OS-X-Version
25-
osx_image: xcode9
26-
27-
before_install:
28-
- "if [ ${TRAVIS_OS_NAME} = 'osx' ]; then brew update && brew install libevent sqlite && brew link --force sqlite; fi"
29-
30-
os:
31-
- linux
32-
- osx
8+
- dmd-2.087.0
9+
- dmd-2.086.1
10+
- dmd-2.085.1
11+
- dmd-2.084.1
12+
- dmd-2.083.1
13+
- dmd-2.082.1
14+
- ldc-1.17.0 # eq to dmd v2.087
15+
- ldc-1.16.0 # eq to dmd v2.086.1
16+
- ldc-1.15.0 # eq to dmd v2.085.1
17+
- ldc-1.14.0 # eq to dmd v2.084.1
18+
- ldc-1.13.0 # eq to dmd v2.083.1
19+
- ldc-1.12.0 # eq to dmd v2.082.1
3320

3421
script:
3522
- dub build --config=full --compiler=${DC}
@@ -38,12 +25,15 @@ script:
3825

3926
addons:
4027
apt:
28+
update: true
4129
sources:
4230
- ubuntu-toolchain-r-test
4331
packages:
4432
- libevent-dev
4533
- libsqlite3-dev
4634
- gcc-6
35+
homebrew:
36+
brewfile: true
4737

4838
# GDC versions need to be setup with correct version of gcc
4939
# The integration tests can only run in Linux container
@@ -52,27 +42,37 @@ matrix:
5242
- env: NAME="MySQL Integration Test with DUB upgrade"
5343
d: dmd
5444
os: linux
55-
service: mysql
56-
before_script: mysql -e 'CREATE DATABASE ddbctest;'
45+
services:
46+
- mysql
47+
before_script: mysql --user=travis -e 'CREATE DATABASE ddbctest;'
5748
script:
5849
- dub upgrade
5950
- dub build --config=full
60-
- cd example && dub build && ./ddbctest --connection=mysql:127.0.0.1 --database=ddbctest --user=root
51+
- cd example && dub build && ./ddbctest --connection=mysql:127.0.0.1 --database=ddbctest --user=travis
6152
- env: NAME="MySQL Integration Test"
6253
d: dmd
6354
os: linux
64-
service: mysql
65-
before_script: mysql -e 'CREATE DATABASE ddbctest;'
55+
services:
56+
- mysql
57+
before_script: mysql --user=travis -e 'CREATE DATABASE ddbctest;'
6658
script:
6759
- dub build --config=full
68-
- cd example && dub build && ./ddbctest --connection=mysql:127.0.0.1 --database=ddbctest --user=root
60+
- cd example && dub build && ./ddbctest --connection=mysql:127.0.0.1 --database=ddbctest --user=travis
6961
- env: NAME="PostgreSQL Integration Test"
7062
d: dmd
7163
os: linux
72-
service: postgresql
64+
services:
65+
- postgresql
7366
before_script: psql -c 'create database ddbctest;' -U postgres
7467
script:
7568
- dub build --config=full
7669
- cd example && dub build && ./ddbctest --connection=pgsql:127.0.0.1 --database=ddbctest --user=postgres
70+
- d: dmd
71+
os: osx
72+
- d: ldc
73+
os: osx
74+
- d: dmd-beta
75+
- d: gdc
7776
allow_failures:
77+
- d: dmd-beta
7878
- d: gdc

Brewfile

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# running 'brew bundle' will install required dependencies
2+
brew 'libevent'
3+
brew 'sqlite'

dub.json

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"license": "Boost Software License (BSL 1.0)",
77
"targetPath": "lib",
88
"targetType": "staticLibrary",
9+
"buildRequirements": [
10+
"allowWarnings"
11+
],
912
"systemDependencies": "Depending on configuration: PostgreSQL and/or SQLite v3",
1013
"configurations": [
1114
{

0 commit comments

Comments
 (0)