Merge branch 'Anne/Front-End-CI' into 'release'

Update .gitlab-ci.yml

See merge request elixxir/client!628

.gitlab-ci.yml

@@ -85,25 +85,33 @@ tag:
         - git tag $(release/client.linux64 version | grep "Elixxir Client v"| cut -d ' ' -f3) -f
         - git push origin_tags -f --tags
 
-bindings:
+bindings-ios:
   stage: build
   except:
     - tags
   tags:
     - ios
   script:
-    - export PATH="/usr/local/opt/go@1.13/bin:$PATH"
     - go get -u golang.org/x/mobile/cmd/gomobile
-    - go get -u golang.org/x/mobile/bind
-    - rm -rf $HOME/go/src/gitlab.com/elixxir/client/
-    - mkdir -p $HOME/go/src/gitlab.com/elixxir/client/
-    - cp -r * $HOME/go/src/gitlab.com/elixxir/client/
-    - GO111MODULE=on gomobile bind -target android -androidapi 21 gitlab.com/elixxir/client/bindings
-    - GO111MODULE=on gomobile bind -target ios gitlab.com/elixxir/client/bindings
+    - gomobile bind -target ios gitlab.com/elixxir/client/bindings
     - zip -r iOS.zip Bindings.framework
   artifacts:
     paths:
       - iOS.zip
+
+bindings-android:
+  stage: build
+  except:
+    - tags
+  tags:
+    - android
+  script:
+    - export ANDROID_HOME=/android-sdk
+    - export PATH=$PATH:/android-sdk/platform-tools/:/usr/local/go/bin
+    - go get -u golang.org/x/mobile/cmd/gomobile
+    - gomobile bind -target android -androidapi 21 gitlab.com/elixxir/client/bindings
+  artifacts:
+    paths:
       - bindings.aar
       - bindings-sources.jar