@@ -144,39 +144,34 @@ against the latest version of the SDK on each commit and PR.
144144
145145### CentOS (7)
146146
147- [ ![ Kokoro install centos status] [ kokoro-install-centos-shield ]] [ kokoro-install-centos-link ]
147+ [ ![ Kokoro install centos-7 status] [ kokoro-install-centos-7- shield ]] [ kokoro-install-centos-7 -link ]
148148
149- [ kokoro-install-centos-shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-centos.svg
150- [ kokoro-install-centos-link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-centos-link.html
149+ [ kokoro-install-centos-7- shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-centos-7 .svg
150+ [ kokoro-install-centos-7- link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-centos-7 -link.html
151151
152- The development tools distributed with CentOS (notably CMake) are too old to
153- build ` google-cloud-cpp ` . In these instructions, we use ` cmake3 ` obtained from
152+ Install the development tools and OpenSSL. The development tools distributed
153+ with CentOS (notably CMake) are too old to build the
154+ ` google-cloud-cpp ` project. We recommend you install cmake3 from
154155[ Software Collections] ( https://www.softwarecollections.org/ ) .
155156
156157``` bash
157- rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
158+ sudo rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
158159sudo yum install -y centos-release-scl
159160sudo yum-config-manager --enable rhel-server-rhscl-7-rpms
160161sudo yum makecache && \
161162sudo yum install -y automake cmake3 curl-devel gcc gcc-c++ git libtool \
162163 make openssl-devel pkgconfig tar wget which zlib-devel
163- ln -sf /usr/bin/cmake3 /usr/bin/cmake && ln -sf /usr/bin/ctest3 /usr/bin/ctest
164+ sudo ln -sf /usr/bin/cmake3 /usr/bin/cmake && sudo ln -sf /usr/bin/ctest3 /usr/bin/ctest
164165```
165166
166167### Debian (Stretch)
167168
168- [ ![ Kokoro install debian status] [ kokoro-install-debian-shield ]] [ kokoro-install-debian-link ]
169+ [ ![ Kokoro install debian-stretch status] [ kokoro-install-debian-stretch- shield ]] [ kokoro-install-debian-stretch -link ]
169170
170- [ kokoro-install-debian-shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-debian.svg
171- [ kokoro-install-debian-link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-debian-link.html
171+ [ kokoro-install-debian-stretch- shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-debian-stretch .svg
172+ [ kokoro-install-debian-stretch- link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-debian-stretch -link.html
172173
173- On Debian Stretch, libcurl links against openssl-1.0.2, and one must link
174- against the same version or risk an inconsistent configuration of the library.
175- This is especially important for multi-threaded applications, as openssl-1.0.2
176- requires explicitly setting locking callbacks. Therefore, to use libcurl one
177- must link against openssl-1.0.2. To do so, we need to install libssl1.0-dev.
178- Note that this removes libssl-dev if you have it installed already, and would
179- prevent you from compiling against openssl-1.1.0.
174+ First install the development tools.
180175
181176``` bash
182177sudo apt update && \
@@ -192,6 +187,8 @@ sudo apt install -y build-essential cmake git gcc g++ cmake \
192187[ kokoro-install-fedora-shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-fedora.svg
193188[ kokoro-install-fedora-link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-fedora-link.html
194189
190+ Install the minimal development tools:
191+
195192``` bash
196193sudo dnf makecache && \
197194sudo dnf install -y cmake gcc-c++ git make openssl-devel pkgconfig \
@@ -200,10 +197,12 @@ sudo dnf install -y cmake gcc-c++ git make openssl-devel pkgconfig \
200197
201198### openSUSE (Tumbleweed)
202199
203- [ ![ Kokoro install opensuse status] [ kokoro-install-opensuse-shield ]] [ kokoro-install-opensuse-link ]
200+ [ ![ Kokoro install opensuse-tumbleweed status] [ kokoro-install-opensuse-tumbleweed-shield ]] [ kokoro-install-opensuse-tumbleweed-link ]
201+
202+ [ kokoro-install-opensuse-tumbleweed-shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-opensuse-tumbleweed.svg
203+ [ kokoro-install-opensuse-tumbleweed-link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-opensuse-tumbleweed-link.html
204204
205- [ kokoro-install-opensuse-shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-opensuse.svg
206- [ kokoro-install-opensuse-link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-opensuse-link.html
205+ Install the minimal development tools:
207206
208207``` bash
209208sudo zypper refresh && \
@@ -218,6 +217,8 @@ sudo zypper install --allow-downgrade -y cmake gcc gcc-c++ git gzip \
218217[ kokoro-install-opensuse-leap-shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-opensuse-leap.svg
219218[ kokoro-install-opensuse-leap-link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-opensuse-leap-link.html
220219
220+ Install the minimal development tools:
221+
221222``` bash
222223sudo zypper refresh && \
223224sudo zypper install --allow-downgrade -y cmake gcc gcc-c++ git gzip \
@@ -226,10 +227,12 @@ sudo zypper install --allow-downgrade -y cmake gcc gcc-c++ git gzip \
226227
227228### Ubuntu (18.04 - Bionic Beaver)
228229
229- [ ![ Kokoro install ubuntu status] [ kokoro-install-ubuntu-shield ]] [ kokoro-install-ubuntu-link ]
230+ [ ![ Kokoro install ubuntu-bionic status] [ kokoro-install-ubuntu-bionic-shield ]] [ kokoro-install-ubuntu-bionic-link ]
231+
232+ [ kokoro-install-ubuntu-bionic-shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-ubuntu-bionic.svg
233+ [ kokoro-install-ubuntu-bionic-link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-ubuntu-bionic-link.html
230234
231- [ kokoro-install-ubuntu-shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-ubuntu.svg
232- [ kokoro-install-ubuntu-link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-ubuntu-link.html
235+ Install the minimal development tools:
233236
234237``` bash
235238sudo apt update && \
@@ -245,6 +248,8 @@ sudo apt install -y build-essential cmake git gcc g++ cmake \
245248[ kokoro-install-ubuntu-xenial-shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-ubuntu-xenial.svg
246249[ kokoro-install-ubuntu-xenial-link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-ubuntu-xenial-link.html
247250
251+ Install the minimal development tools:
252+
248253``` bash
249254sudo apt update && \
250255sudo apt install -y build-essential cmake git gcc g++ cmake \
@@ -259,6 +264,8 @@ sudo apt install -y build-essential cmake git gcc g++ cmake \
259264[ kokoro-install-ubuntu-trusty-shield ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-ubuntu-trusty.svg
260265[ kokoro-install-ubuntu-trusty-link ] : https://storage.googleapis.com/cloud-cpp-kokoro-status/kokoro-install-ubuntu-trusty-link.html
261266
267+ Install the minimal development tools.
268+
262269We use the ` ubuntu-toolchain-r ` PPA to get a modern version of CMake:
263270
264271``` bash
0 commit comments