fix(ci): upgrade circle ci docker image

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Jan 21, 2019 · bbad668 · bbad668
1 parent eef6664
commit bbad668
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -242,7 +242,7 @@ jobs:
       BUILD: /tmp/fl/build
 
     docker:
-      - image: bertychat/android-ci:v2
+      - image: bertychat/android-ci:v3
     steps:
       - checkout:
           path: ~/go/src/berty.tech/

diff --git a/build/docker/android-ci/Dockerfile b/build/docker/android-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM  circleci/android:api-27-node8-alpha
+FROM  circleci/android:api-28-node8-alpha
 
 RUN cd ~ \
 &&  git clone https://github.com/udhos/update-golang \
@@ -8,9 +8,9 @@ RUN echo "export PATH=/usr/local/go/bin/:~/go/bin:$PATH" >> ~/.bashrc
 
 ENV PATH="/usr/local/go/bin/:/home/circleci/go/bin:${PATH}"
 
-RUN go get golang.org/x/mobile/cmd/gomobile
+RUN go get -u golang.org/x/mobile/cmd/gomobile
 
-RUN sdkmanager ndk-bundle
+RUN yes | sdkmanager ndk-bundle || true
 
 COPY ./gomobile-env-flag.diff /tmp/gomobile-env-flag.diff
 

diff --git a/build/docker/android-ci/Makefile b/build/docker/android-ci/Makefile
@@ -1,5 +1,5 @@
 MAKEFILE_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-IMAGE ?= bertychat/android-ci:v2
+IMAGE ?= bertychat/android-ci:v3
 
 build:
 	cp $(MAKEFILE_DIR)/../patch/gomobile-env-flag.diff .

diff --git a/client/react-native/gomobile/Makefile b/client/react-native/gomobile/Makefile
@@ -22,7 +22,7 @@ EXT_LDFLAGS ?= -ldflags="-X \"berty.tech/client/react-native/gomobile/vendor/ber
 
 GOPATH ?=		$(HOME)/go
 
-CGO_CPPFLAGS ?= -I$(MAKEFILE_DIR)/../../common/openssl/built/include
+CGO_CPPFLAGS ?= -Wno-error=unused-command-line-argument -I$(MAKEFILE_DIR)/../../common/openssl/built/include
 
 CGO_OS_LDFLAGS ?= -L/usr/local/opt/openssl/lib
 CGO_OS_CPPFLAGS ?= -I/usr/local/opt/openssl/include