Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ci dependencies #38

Merged
merged 3 commits into from
Dec 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
asan:
docker:
- image: ubuntu:17.10
- image: ubuntu:18.04
steps:
- checkout
- run: ./ci/install_dependencies.sh
Expand All @@ -12,7 +12,7 @@ jobs:
destination: Test.log
tsan:
docker:
- image: ubuntu:17.10
- image: ubuntu:18.04
steps:
- checkout
- run: mkdir -p /build
Expand All @@ -23,15 +23,15 @@ jobs:
destination: Test.log
bazel:
docker:
- image: ubuntu:17.10
- image: ubuntu:18.04
steps:
- checkout
- run: ./ci/install_dependencies.sh
- run: ./ci/install_bazel.sh
- run: ./ci/do_ci.sh bazel.build
plugin:
docker:
- image: ubuntu:17.10
- image: ubuntu:18.04
steps:
- checkout
- run: ./ci/do_ci.sh cmake.plugin
Expand All @@ -40,7 +40,7 @@ jobs:
destination: libzipkin_opentracing_plugin.so
release:
docker:
- image: ubuntu:17.10
- image: ubuntu:18.04
steps:
- run: apt-get -qq update; apt-get -y install git ssh
- checkout
Expand Down
2 changes: 2 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
workspace(name = "com_github_rnburn_zipkin_opentracing")

load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

git_repository(
name = "io_opentracing_cpp",
remote = "https://github.com/opentracing/opentracing-cpp",
Expand Down
2 changes: 2 additions & 0 deletions ci/WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
workspace(name = "com_github_rnburn_zipkin_opentracing")

load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

git_repository(
name = "io_opentracing_cpp",
remote = "https://github.com/opentracing/opentracing-cpp",
Expand Down
9 changes: 5 additions & 4 deletions ci/install_bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ set -e
apt-get install --no-install-recommends --no-install-suggests -y \
curl \
ca-certificates \
openjdk-8-jdk
openjdk-8-jdk \
gnupg2 \
g++ unzip zip

echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" \
| tee /etc/apt/sources.list.d/bazel.list
curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
apt-get update
apt-get install --no-install-recommends --no-install-suggests -y \
bazel
apt-get upgrade -y bazel
apt-get install --no-install-recommends --no-install-suggests -y bazel
5 changes: 3 additions & 2 deletions ci/install_dependencies.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 \
libcurl4-openssl-dev \
build-essential \
Expand All @@ -11,7 +11,8 @@ apt-get install --no-install-recommends --no-install-suggests -y \

# Build OpenTracing
cd /
git clone https://github.com/opentracing/opentracing-cpp.git
export OPENTRACING_VERSION=1.5.0
git clone -b v$OPENTRACING_VERSION https://github.com/opentracing/opentracing-cpp.git
cd opentracing-cpp
mkdir .build && cd .build
cmake -DBUILD_TESTING=OFF ..
Expand Down