diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-10-23 00:47:33 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-10-23 01:59:04 +0300 |
| commit | 7f51ba294bf0aea12631db0eddafa2a9562c9a5f (patch) | |
| tree | 68118a0fb8028f99eb97d2281d9159be29da24f7 | |
| parent | b1d048217a08bf38f0c2037d56381e158da7b6bf (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-gcloud.tar.gz | |
[build] Bump CI docker imageupstream/tmpsantos-gcloud
This version includes gcloud, needed to run
android firebase tests.
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | scripts/ci/Dockerfile | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/circle.yml b/circle.yml index e1923498a7..ca732d200c 100644 --- a/circle.yml +++ b/circle.yml @@ -183,7 +183,7 @@ executors: ubuntu-disco: docker: # FIXME: Move the image to mbgl/ - - image: tmpsantos/mbgl_ci:1.5 + - image: tmpsantos/mbgl_ci:1.6 resource_class: xlarge working_directory: /src environment: diff --git a/scripts/ci/Dockerfile b/scripts/ci/Dockerfile index 648581044f..09ae07997d 100644 --- a/scripts/ci/Dockerfile +++ b/scripts/ci/Dockerfile @@ -40,7 +40,7 @@ RUN set -eu && apt-get install -y \ software-properties-common \ xvfb -RUN pip3 install cmake_format +RUN pip3 install cmake-format==0.5.5 # Linux dependencies RUN set -eu && apt-get install -y \ @@ -103,6 +103,12 @@ RUN set -eu \ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" \ "cmake;3.10.2.4988404" +# Install gcloud for Firebase testing +RUN set -eu \ + && echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \ + && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \ + && apt-get update -y && apt-get install google-cloud-sdk -y + # Configure ccache RUN set -eu && /usr/sbin/update-ccache-symlinks |