gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Googletest export

Browse Source 
Move Googletest OSS bazel builds to latest bazel.
The latest bazel ( 0.27.0 as of now ) does not run on trusty.

PiperOrigin-RevId: 253829774
This commit is contained in:
misterg
2019-06-18 14:21:57 -04:00
committed by Gennadiy Civil
parent ee32b72e12
commit 1d721a7a9d
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -11,28 +11,26 @@ language: cpp
matrix: matrix:
include: include:
- os: linux - os: linux
dist: trusty
sudo: required sudo: required
group: deprecated-2017Q3
before_install: chmod -R +x ./ci/*platformio.sh before_install: chmod -R +x ./ci/*platformio.sh
install: ./ci/install-platformio.sh install: ./ci/install-platformio.sh
script: ./ci/build-platformio.sh script: ./ci/build-platformio.sh
- os: linux - os: linux
dist: xenial
compiler: gcc compiler: gcc
sudo : true sudo : true
install: ./ci/install-linux.sh && ./ci/log-config.sh install: ./ci/install-linux.sh && ./ci/log-config.sh
script: ./ci/build-linux-bazel.sh script: ./ci/build-linux-bazel.sh
- os: linux - os: linux
dist: xenial
compiler: clang compiler: clang
sudo : true sudo : true
install: ./ci/install-linux.sh && ./ci/log-config.sh install: ./ci/install-linux.sh && ./ci/log-config.sh
script: ./ci/build-linux-bazel.sh script: ./ci/build-linux-bazel.sh
- os: linux - os: linux
group: deprecated-2017Q4
compiler: gcc compiler: gcc
env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11
- os: linux - os: linux
group: deprecated-2017Q4
compiler: clang compiler: clang
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 -Wgnu-zero-variadic-macro-arguments env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 -Wgnu-zero-variadic-macro-arguments
- os: linux - os: linux

5
ci/install-linux.sh
View File

@@ -41,10 +41,7 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then
echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | \ echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | \
sudo tee /etc/apt/sources.list.d/bazel.list sudo tee /etc/apt/sources.list.d/bazel.list
curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add - curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
sudo apt-get update && sudo apt-get install -y gcc-4.9 g++-4.9 clang-3.9 sudo apt-get update && sudo apt-get install -y bazel gcc-4.9 g++-4.9 clang-3.9
sudo wget https://github.com/bazelbuild/bazel/releases/download/0.26.1/bazel-0.26.1-installer-linux-x86_64.sh
sudo chmod +x bazel-0.26.1-installer-linux-x86_64.sh
sudo ./bazel-0.26.1-installer-linux-x86_64.sh
elif [ "${CXX}" = "clang++" ]; then elif [ "${CXX}" = "clang++" ]; then
# Use ccache, assuming $HOME/bin is in the path, which is true in the Travis build environment. # 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}; ln -sf /usr/bin/ccache $HOME/bin/${CXX};