diff --git a/CMakeLists.txt b/CMakeLists.txt index f891a1a0c2..9f78df0be1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1) -# See https://cmake.org/cmake/help/v3.3/policy/CMP0057.html -# required by certain versions of gtest +# See https://cmake.org/cmake/help/v3.3/policy/CMP0057.html required by certain +# versions of gtest cmake_policy(SET CMP0057 NEW) project(opentelemetry-cpp) diff --git a/WORKSPACE b/WORKSPACE index 83ef873ce6..10b3c20457 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -20,6 +20,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Only needed for tests, not to build the OpenTelemetry library. http_archive( name = "com_google_googletest", + sha256 = "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", strip_prefix = "googletest-release-1.10.0", urls = ["https://github.com/google/googletest/archive/release-1.10.0.tar.gz"], ) diff --git a/ci/install_gcc48.sh b/ci/install_gcc48.sh index a9cf380b29..c076d97402 100755 --- a/ci/install_gcc48.sh +++ b/ci/install_gcc48.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -apt-get update +apt-get update apt-get install --no-install-recommends --no-install-suggests -y \ g++-4.8 diff --git a/ci/setup_ci_environment.sh b/ci/setup_ci_environment.sh index 13ad19d89b..56be9af1f3 100755 --- a/ci/setup_ci_environment.sh +++ b/ci/setup_ci_environment.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -apt-get update +apt-get update apt-get install --no-install-recommends --no-install-suggests -y \ build-essential \ ca-certificates \ diff --git a/tools/setup-buildtools-mac.sh b/tools/setup-buildtools-mac.sh index 335fd8e3e4..b74c727df4 100644 --- a/tools/setup-buildtools-mac.sh +++ b/tools/setup-buildtools-mac.sh @@ -5,7 +5,7 @@ # control of the brew dirs. That causes the brew update to fail. # Temporarily allow the user to take over control of brew files. -echo *** +echo *** echo *** You may need to enter your admin password to update the brew files: echo ***