Skip to content

Commit

Permalink
Fix nits: format and shasum. (#23)
Browse files Browse the repository at this point in the history
  • Loading branch information
g-easy authored Jan 7, 2020
1 parent 5922512 commit c5d421a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
1 change: 1 addition & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
2 changes: 1 addition & 1 deletion ci/install_gcc48.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ci/setup_ci_environment.sh
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion tools/setup-buildtools-mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ***

Expand Down

0 comments on commit c5d421a

Please sign in to comment.