Skip to content

Commit 77bd523

Browse files
committed
CXX-1439 Get travis green again
1 parent dbd447f commit 77bd523

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

.travis.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
dist: trusty
2+
sudo: required
3+
14
language: cpp
25

36
compiler:
@@ -6,8 +9,8 @@ compiler:
69

710
env:
811
global:
9-
- MONGO_REPO="http://repo.mongodb.com/apt/ubuntu"
10-
- REPO_TYPE="precise/mongodb-enterprise/3.2 multiverse"
12+
- MONGO_REPO="[ arch=amd64 ] http://repo.mongodb.com/apt/ubuntu"
13+
- REPO_TYPE="trusty/mongodb-enterprise/3.4 multiverse"
1114
- SOURCES_LOC="/etc/apt/sources.list.d/mongodb-enterprise.list"
1215
- KEY_SERVER="hkp://keyserver.ubuntu.com:80"
1316
- CMAKE_VERSION="cmake-3.2.3-Linux-x86_64"
@@ -21,20 +24,16 @@ env:
2124
before_install:
2225
# Add the modern toolchain repositories (llvm repo depends on ubunut-toolchain-r + gcc)
2326
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
24-
- sudo add-apt-repository -y 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.6 main'
27+
- sudo add-apt-repository -y 'deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main'
2528
- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
2629

2730
# Get the latest CMake
2831
- curl -O https://cmake.org/files/v3.2/${CMAKE_VERSION}.tar.gz
2932

3033
# MongoDB Enterprise Edition, latest stable version
31-
- sudo apt-key adv --keyserver ${KEY_SERVER} --recv 7F0CEB10
32-
- sudo apt-key adv --keyserver ${KEY_SERVER} --recv D68FA50FEA312927
34+
- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
3335
- echo "deb ${MONGO_REPO} ${REPO_TYPE}" | sudo tee ${SOURCES_LOC}
3436

35-
# CMake
36-
- sudo add-apt-repository --yes ppa:kalakris/cmake
37-
3837
# Update all the repositories
3938
- sudo apt-get update -qq
4039

@@ -51,22 +50,27 @@ install:
5150
# CMake
5251
- tar -zxvf ${CMAKE_VERSION}.tar.gz -C build
5352

53+
# Blow away any prior mongodb state so we don't have prior db state that
54+
# that doesn't have the right featureCompatibilityVersion
55+
- sudo dpkg --purge mongodb-org
56+
- sudo rm -rf /var/lib/mongodb
57+
5458
# Install MongoDB Enterprise
5559
- sudo apt-get install mongodb-enterprise-server
5660

57-
# Install CMake (Versions lower than 2.8.8 do not support object libraries)
58-
- sudo apt-get install cmake
59-
6061
# Install Mongo C Driver
6162
- pushd mongo-c-driver
6263

63-
# TODO: Update this to our real minimum for the C++11 driver 3.1 release, once known.
64+
# Check out the the minimum C driver version for this branch
6465
- git checkout 1.5.0
6566

6667
- ./autogen.sh --enable-tests=no --enable-examples=no --with-libbson=bundled; make; sudo make install
6768

6869
- popd
6970

71+
# Start up the server. We don't care to terminate it, since we are in an ephemeral VM.
72+
- sudo service mongod start
73+
7074
before_script:
7175
- $CC --version
7276
- $CXX --version

0 commit comments

Comments
 (0)