Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
859bfe89
Commit
859bfe89
authored
May 28, 2020
by
dmauro
Committed by
Derek Mauro
May 28, 2020
Browse files
Googletest export
Update Travis CI to use Ubuntu Bionic in some cases PiperOrigin-RevId: 313639562
parent
fd32ba66
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
15 deletions
+9
-15
.travis.yml
.travis.yml
+6
-11
ci/build-linux-bazel.sh
ci/build-linux-bazel.sh
+0
-1
ci/env-linux.sh
ci/env-linux.sh
+2
-2
ci/install-linux.sh
ci/install-linux.sh
+1
-1
No files found.
.travis.yml
View file @
859bfe89
...
...
@@ -14,19 +14,21 @@ matrix:
install
:
./ci/install-platformio.sh
script
:
./ci/build-platformio.sh
-
os
:
linux
dist
:
xenial
dist
:
bionic
compiler
:
gcc
install
:
./ci/install-linux.sh && ./ci/log-config.sh
script
:
./ci/build-linux-bazel.sh
-
os
:
linux
dist
:
xenial
dist
:
bionic
compiler
:
clang
install
:
./ci/install-linux.sh && ./ci/log-config.sh
script
:
./ci/build-linux-bazel.sh
-
os
:
linux
dist
:
bionic
compiler
:
gcc
env
:
BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated"
-
os
:
linux
dist
:
bionic
compiler
:
clang
env
:
BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON
-
os
:
osx
...
...
@@ -48,16 +50,9 @@ script: ./ci/travis.sh
# This section installs the necessary dependencies.
addons
:
apt
:
# List of whitelisted in travis packages for ubuntu-precise can be found here:
# https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
# List of whitelisted in travis apt-sources:
# https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
sources
:
-
ubuntu-toolchain-r-test
-
llvm-toolchain-precise-3.9
packages
:
-
g++
-4.9
-
clang
-3.9
-
g++
-
clang
update
:
true
homebrew
:
packages
:
...
...
ci/build-linux-bazel.sh
View file @
859bfe89
...
...
@@ -32,6 +32,5 @@
set
-e
bazel version
bazel build
--curses
=
no //...:all
bazel
test
--curses
=
no //...:all
bazel
test
--curses
=
no //...:all
--define
absl
=
1
ci/env-linux.sh
View file @
859bfe89
...
...
@@ -36,6 +36,6 @@
# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
if
[
"
${
TRAVIS_OS_NAME
}
"
=
"linux"
]
;
then
if
[
"
$CXX
"
=
"g++"
]
;
then
export
CXX
=
"g++
-4.9
"
CC
=
"gcc
-4.9
"
;
fi
if
[
"
$CXX
"
=
"clang++"
]
;
then
export
CXX
=
"clang++
-3.9
"
CC
=
"clang
-3.9
"
;
fi
if
[
"
$CXX
"
=
"g++"
]
;
then
export
CXX
=
"g++"
CC
=
"gcc"
;
fi
if
[
"
$CXX
"
=
"clang++"
]
;
then
export
CXX
=
"clang++"
CC
=
"clang"
;
fi
fi
ci/install-linux.sh
View file @
859bfe89
...
...
@@ -41,7 +41,7 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then
echo
"deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8"
|
\
sudo tee
/etc/apt/sources.list.d/bazel.list
curl https://bazel.build/bazel-release.pub.gpg |
sudo
apt-key add -
sudo
apt-get update
&&
sudo
apt-get
install
-y
bazel gcc
-4.9 g++-4.9
clang
-3.9
sudo
apt-get update
&&
sudo
apt-get
install
-y
bazel gcc
g++
clang
elif
[
"
${
CXX
}
"
=
"clang++"
]
;
then
# Use ccache, assuming $HOME/bin is in the path, which is true in the Travis build environment.
ln
-sf
/usr/bin/ccache
$HOME
/bin/
${
CXX
}
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment