Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 87efb13

Browse files
authored
Jenkins update to gcc5 (#1311)
* Move to gcc5 * Compilation fix (don't warn about c++14) * Remove gcc 4.8 builds from Travis
1 parent fd4a31c commit 87efb13

File tree

3 files changed

+16
-46
lines changed

3 files changed

+16
-46
lines changed

.travis.yml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,46 +14,6 @@ matrix:
1414
- PELOTON_BUILD_TYPE=Debug
1515
- COVERALLS=Off
1616

17-
# Linux builds for gcc 4.8
18-
- os: linux
19-
sudo: required
20-
dist: trusty
21-
compiler: gcc
22-
addons:
23-
apt:
24-
sources:
25-
- llvm-toolchain-precise-3.7
26-
- ubuntu-toolchain-r-test
27-
packages:
28-
- g++-4.8
29-
env:
30-
# NAME has no actual use, just to make the travis jobs overview more clear
31-
- NAME="gcc4.8 Debug"
32-
- CXX=g++-4.8
33-
- CC=gcc-4.8
34-
- PELOTON_BUILD_TYPE=Debug
35-
# COVERALLS: we run coveralls only for one compiler
36-
- COVERALLS=Off
37-
38-
- os: linux
39-
sudo: required
40-
dist: trusty
41-
compiler: gcc
42-
addons:
43-
apt:
44-
sources:
45-
- llvm-toolchain-precise-3.7
46-
- ubuntu-toolchain-r-test
47-
packages:
48-
- g++-4.8
49-
env:
50-
# NAME has no actual use, just to make the travis jobs overview more clear
51-
- NAME="gcc4.8 Release"
52-
- CXX=g++-4.8
53-
- CC=gcc-4.8
54-
- PELOTON_BUILD_TYPE=Release
55-
- COVERALLS=Off
56-
5717
# Linux builds for gcc 5
5818
- os: linux
5919
sudo: required

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ include(cmake/Dependencies.cmake)
4242

4343
# ---[ C++11 Flags
4444
include(CheckCXXCompilerFlag)
45-
check_cxx_compiler_flag("-std=c++1y" COMPILER_SUPPORTS_CXX1Y)
45+
check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
4646

47-
if(COMPILER_SUPPORTS_CXX1Y)
48-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
47+
if(COMPILER_SUPPORTS_CXX11)
48+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-c++14-compat")
4949
else()
50-
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++1Y support. Please use a different C++ compiler.")
50+
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
5151
endif()
5252

5353
# Create a new pre-processor macro __PELOTONFILE__ that has a truncated

Jenkinsfile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,15 @@ pipeline {
4343
}
4444
}
4545

46-
stage('Ubuntu Trusty/gcc-4.8.4/llvm-3.7.1 (Debug)') {
46+
stage('Ubuntu Trusty/gcc-5.4.0/llvm-3.7.1 (Debug)') {
4747
agent { docker { image 'ubuntu:trusty' } }
4848
steps {
4949
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
50+
sh 'sudo apt-get -y install software-properties-common'
51+
sh 'sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test'
52+
sh 'sudo apt-get update'
53+
sh 'sudo apt-get -y install gcc-5 g++-5'
54+
sh 'sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1 --slave /usr/bin/g++ g++ /usr/bin/g++-5'
5055
sh 'python script/validators/source_validator.py'
5156
sh 'mkdir build'
5257
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
@@ -59,10 +64,15 @@ pipeline {
5964
}
6065
}
6166

62-
stage('Ubuntu Trusty/gcc-4.8.4/llvm-3.7.1 (Release)') {
67+
stage('Ubuntu Trusty/gcc-5.4.0/llvm-3.7.1 (Release)') {
6368
agent { docker { image 'ubuntu:trusty' } }
6469
steps {
6570
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
71+
sh 'sudo apt-get -y install software-properties-common'
72+
sh 'sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test'
73+
sh 'sudo apt-get update'
74+
sh 'sudo apt-get -y install gcc-5 g++-5'
75+
sh 'sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1 --slave /usr/bin/g++ g++ /usr/bin/g++-5'
6676
sh 'python script/validators/source_validator.py'
6777
sh 'mkdir build'
6878
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'

0 commit comments

Comments
 (0)