From 6c971ca9a34b3eb82180732db807da74ea71cf79 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Mon, 17 Jun 2019 15:03:27 -0400 Subject: [PATCH 1/6] testing, explicitly specify compiler --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61c51dd25a..d33e332f3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: install: ./ci/install-platformio.sh script: ./ci/build-platformio.sh - os: linux - compiler: gcc + compiler: gcc4.9 sudo : true install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh From 919142f8a96bb37f10bcad1f45d77855faaa7d88 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Mon, 17 Jun 2019 15:13:38 -0400 Subject: [PATCH 2/6] testing with bazel 0.26.1 --- ci/install-linux.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/install-linux.sh b/ci/install-linux.sh index 05e2cb2803..8058dbdc1f 100755 --- a/ci/install-linux.sh +++ b/ci/install-linux.sh @@ -41,7 +41,8 @@ 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 gcc-4.9 g++-4.9 clang-3.9 + sudo apt-get install bazel 0.26.1 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}; From 1e5ad17e9751f9181670d55f76d6a78df8f073d7 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Mon, 17 Jun 2019 15:19:01 -0400 Subject: [PATCH 3/6] testing with bazel 0.26.1 --- ci/install-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-linux.sh b/ci/install-linux.sh index 8058dbdc1f..7dcd0bd781 100755 --- a/ci/install-linux.sh +++ b/ci/install-linux.sh @@ -42,7 +42,7 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then 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 gcc-4.9 g++-4.9 clang-3.9 - sudo apt-get install bazel 0.26.1 + sudo apt-get install bazel-0.26.1 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}; From 4b6a3cc6cb8e0cf8c2f85d21a5056de47495e8d7 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Mon, 17 Jun 2019 15:30:16 -0400 Subject: [PATCH 4/6] bazel 0.26.1 --- ci/install-linux.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/install-linux.sh b/ci/install-linux.sh index 7dcd0bd781..b1da9a50d4 100755 --- a/ci/install-linux.sh +++ b/ci/install-linux.sh @@ -42,8 +42,11 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then 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 gcc-4.9 g++-4.9 clang-3.9 - sudo apt-get install bazel-0.26.1 -elif [ "${CXX}" = "clang++" ]; then + wget https://github.com/bazelbuild/bazel/releases/download/0.26.1/bazel-0.26.1-installer-linux-x86_64.sh + chmod +x bazel-0.26.1-installer-linux-x86_64.sh + ./bazel-0.26.1-installer-linux-x86_64.sh + + 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}; ln -sf /usr/bin/ccache $HOME/bin/${CC}; From 93d69df460eb72bac67f59b6591fff6ac8fce992 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Mon, 17 Jun 2019 15:33:09 -0400 Subject: [PATCH 5/6] bazel 0.26.1 --- ci/install-linux.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/install-linux.sh b/ci/install-linux.sh index b1da9a50d4..1cb775cd36 100755 --- a/ci/install-linux.sh +++ b/ci/install-linux.sh @@ -42,9 +42,9 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then 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 gcc-4.9 g++-4.9 clang-3.9 - wget https://github.com/bazelbuild/bazel/releases/download/0.26.1/bazel-0.26.1-installer-linux-x86_64.sh - chmod +x bazel-0.26.1-installer-linux-x86_64.sh - ./bazel-0.26.1-installer-linux-x86_64.sh + 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 # Use ccache, assuming $HOME/bin is in the path, which is true in the Travis build environment. From fe3a10b41af023eba5f3d364f793d5ec8c0cb2b4 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Mon, 17 Jun 2019 15:42:03 -0400 Subject: [PATCH 6/6] revert travis.yml, irrelevant --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d33e332f3b..61c51dd25a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: install: ./ci/install-platformio.sh script: ./ci/build-platformio.sh - os: linux - compiler: gcc4.9 + compiler: gcc sudo : true install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh