ci chores 32

matejpolak · Jun 19, 2020 · a70fa06 · a70fa06
1 parent cca0cd0
commit a70fa06
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 73 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,78 +16,29 @@ jobs:
       osx_image: xcode11.3
       install: skip
       script: ci/run_osx_ios.sh
-    # TODO: Travis sucks at android emulation. will tackle it separately
-    # - name: "HelloWorld Android: E2E"
-    #   sudo: true
-    #   language: generic
-    #   dist: bionic
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - bridge-utils
-    #         - libpulse0
-    #         - libvirt-bin
-    #         - qemu-kvm
-    #         - virtinst
-    #         - ubuntu-vm-builder
-    #   env:
-    #     global:
-    #       - ABI=x86_64
-    #       - API=29
-    #       - ADB_INSTALL_TIMEOUT=8
-    #       - ANDROID_HOME=${HOME}/android-sdk
-    #       - ANDROID_TOOLS_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip"
-    #       - EMU_FLAVOR=default
-    #       - GRAVIS="https://raw.githubusercontent.com/DanySK/Gravis-CI/master/"
-    #       - JDK="1.8"
-    #       - TOOLS=${ANDROID_HOME}/tools
-    #       - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
-    #   before_install:
-    #     - sudo adduser $USER libvirt
-    #     - sudo adduser $USER kvm
-    #     - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh
-    #     - export TARGET_JDK="${JDK}"
-    #     - JDK="1.8"
-    #     - source ~/.install-jdk-travis.sh
-    #     - wget -q "${ANDROID_TOOLS_URL}" -O android-sdk-tools.zip
-    #     - unzip -q android-sdk-tools.zip -d ${ANDROID_HOME}
-    #     - rm android-sdk-tools.zip
-    #     - mkdir ~/.android
-    #     - echo 'count=0' > ~/.android/repositories.cfg
-    #     - yes | sdkmanager --licenses
-    #   install:
-    #     - echo y | sdkmanager "platform-tools" >/dev/null
-    #     - echo y | sdkmanager "tools" >/dev/null
-    #     - echo y | sdkmanager "build-tools;28.0.3" >/dev/null
-    #     - echo y | sdkmanager "platforms;android-$API" >/dev/null
-    #     - echo y | sdkmanager "platforms;android-28" >/dev/null
-    #     - echo y | sdkmanager "emulator" >/dev/null
-    #     - echo y | sdkmanager "extras;android;m2repository" >/dev/null
-    #     - echo y | sdkmanager "system-images;android-$API;$EMU_FLAVOR;$ABI" >/dev/null
-    #     - echo no | avdmanager create avd --force -n android_test -k "system-images;android-$API;$EMU_FLAVOR;$ABI" -c 10M
-    #     - |
-    #       EMU_PARAMS="-verbose -no-snapshot -no-window -camera-back none -camera-front none -selinux permissive -qemu -m 2048"
-    #       EMU_COMMAND="emulator"
-    #       if [[ $ABI =~ "x86" ]]; then
-    #         EMU_COMMAND="emulator-headless"
-    #       fi
-    #       sudo -E sudo -u $USER -E bash -c "${ANDROID_HOME}/emulator/${EMU_COMMAND} -avd android_test ${AUDIO} ${EMU_PARAMS} &"
-    #     - JDK="${TARGET_JDK}"
-    #     - source ~/.install-jdk-travis.sh
-    #     - echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
-    #   script:
-    #     - yarn bootstrap
-    #     - cd packages/app
-    #     - rnv template apply --template renative-template-hello-world --ci --mono
-    #     - yarn e2e-android
-    #   before_cache:
-    #     - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-    #     - curl "${GRAVIS}.clean_gradle_cache.sh" --output ~/.clean_gradle_cache.sh
-    #     - bash ~/.clean_gradle_cache.sh
-    #   cache:
-    #     directories:
-    #       - $HOME/.gradle/caches/
-    #       - $HOME/.gradle/wrapper/
+    - name: "RNV Android: Build"
+      language: android
+      dist: trusty
+      cache:
+        directories:
+          - node_modules
+          - $HOME/.gradle
+      sudo: required
+      jdk: oraclejdk8
+      android:
+        components:
+          - tools-26.1.1
+          - build-tools-28.0.3
+          - extra-google-m2repository
+          - extra-android-m2repository
+          - platform-tools-28.0.2
+          - android-28
+          - sys-img-x86-android-28
+      install:
+        - nvm install 13.13.0
+        - echo yes | sdkmanager "platforms;android-28"
+        - rm -rf ~/.yarn/bin/yarn || true && npm uninstall --global yarn; npm install --global yarn; yarn --version
+      script: ci/run_linux_android.sh
     - name: "HelloWorld Web: E2E"
       dist: trusty
       language: node_js

diff --git a/ci/run_linux_android.sh b/ci/run_linux_android.sh
@@ -28,4 +28,7 @@ cd packages/app
 # RUN
 
 npx rnv template apply --template renative-template-hello-world --ci --mono
-yarn e2e-android
+npx rnv build -p android -s test -r --ci --mono
+
+# TODO: Travis sucks at android emulation. will tackle it separately
+# yarn e2e-android