From 40e219abcc7755c23398a925e9811522e5ea30a3 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Thu, 31 Jan 2019 14:41:18 +0200 Subject: [PATCH 1/4] Update packages output dir --- .travis.yml | 63 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a854512..e9cfa57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ env: global: - ANDROID_PACKAGE='camera-debug.apk' - ANDROID_PACKAGE_NEXT='camera-debug-next.apk' - - ANDROID_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/android/app/build/outputs/apk/debug + - ANDROID_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/outputs - ANDROID_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$ANDROID_PACKAGE_NEXT?overwrite=true" - IOS_PACKAGE_NEXT='camera-next.zip' - - IOS_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/ios/build/emulator + - IOS_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/outputs - IOS_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$IOS_PACKAGE_NEXT?overwrite=true" git: @@ -20,57 +20,102 @@ matrix: os: osx env: - WebPackiOS="12.0" + - Type="VanillaJS" osx_image: xcode10.0 language: node_js node_js: "8" jdk: oraclejdk8 before_script: - cd ../demo && tns platform add ios@next + script: + - cd ../demo && npm run build.plugin && npm i && tns build ios --bundle --env.uglify --copy-to "./outputs/demo.app" + - cd $IOS_PACKAGE_FOLDER && zip -r $IOS_PACKAGE_NEXT demo.app + - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE --data-binary @$IOS_PACKAGE_FOLDER/$IOS_PACKAGE_NEXT" + - os: osx + env: + - WebPackiOS="12.0" + - Type="Angular" + osx_image: xcode10.0 + language: node_js + node_js: "8" + jdk: oraclejdk8 + before_script: - cd ../demo-angular && tns platform add ios@next script: - - cd ../demo && npm run build.plugin && npm i && tns build ios --bundle --env.uglify - cd ../publish && sh pack.sh && cp package/*.tgz ../demo-angular/package.tgz - cd ../demo-angular && tns plugin add package.tgz && npm i && tns build ios --bundle --env.uglify --env.aot - language: android os: linux env: - WebPackAndroid="28" + - Type="VanillaJS" jdk: oraclejdk8 before_install: nvm install 8.11.4 before_script: - cd ../demo && tns platform add android@next + script: + - cd ../demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify --env.snapshot --copy-to "./outputs/app-debug.apk" + - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/app-debug.apk" + - language: android + os: linux + env: + - WebPackAndroid="28" + - Type="Angular" + jdk: oraclejdk8 + before_install: nvm install 8.11.4 + before_script: - cd ../demo-angular && tns platform add android@next script: - - cd ../demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify --env.snapshot - cd ../publish && sh pack.sh && cp package/*.tgz ../demo-angular/package.tgz - cd ../demo-angular && tns plugin add package.tgz && npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot - env: - BuildAndroid="28" + - Type="VanillaJS" language: android os: linux jdk: oraclejdk8 before_install: nvm install 8.11.4 before_script: - cd ../demo && tns platform add android@next + script: + - cd ../src && npm i && npm run tsc && cd ../demo && tns build android + - env: + - BuildAndroid="28" + - Type="Angular" + language: android + os: linux + jdk: oraclejdk8 + before_install: nvm install 8.11.4 + before_script: - cd ../demo-angular && tns platform add android@next script: - - cd ../src && npm i && npm run tsc && cd ../demo && tns build android && cd ../demo-angular && tns build android - - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE --data-binary @$ANDROID_PACKAGE_FOLDER/app-debug.apk" + - cd ../src && npm i && npm run tsc && cd ../demo-angular && tns build android - os: osx env: - BuildiOS="12.0" - Xcode="10.0" + - Type="VanillaJS" osx_image: xcode10.0 language: node_js node_js: "8" jdk: oraclejdk8 before_script: - cd ../demo && tns platform add ios@next + script: + - cd ../src && npm i && npm run tsc && cd ../demo && tns build ios + - os: osx + env: + - BuildiOS="12.0" + - Xcode="10.0" + - Type="Angular" + osx_image: xcode10.0 + language: node_js + node_js: "8" + jdk: oraclejdk8 + before_script: - cd ../demo-angular && tns platform add ios@next script: - - cd ../src && npm i && npm run tsc && cd ../demo && tns build ios && cd ../demo-angular && tns build ios - - cd $IOS_PACKAGE_FOLDER && zip -r $IOS_PACKAGE_NEXT demo.app - - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE --data-binary @$IOS_PACKAGE_FOLDER/$IOS_PACKAGE_NEXT" + - cd ../src && npm i && npm run tsc && cd ../demo-angular && tns build ios - stage: "UI Tests" env: - Android="23" From 1bd5f38f301dc5ea9e4105d6f70ccbd96cea7ecd Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Thu, 31 Jan 2019 15:53:10 +0200 Subject: [PATCH 2/4] Update webpack build stages --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9cfa57..bc8a860 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,8 +42,9 @@ matrix: before_script: - cd ../demo-angular && tns platform add ios@next script: - - cd ../publish && sh pack.sh && cp package/*.tgz ../demo-angular/package.tgz - - cd ../demo-angular && tns plugin add package.tgz && npm i && tns build ios --bundle --env.uglify --env.aot + - cd src && npm run build && npm pack + - cd ../demo-angular && tns plugin add ../src/*.tgz + - npm i && tns build ios --bundle --env.uglify --env.aot - language: android os: linux env: @@ -66,8 +67,10 @@ matrix: before_script: - cd ../demo-angular && tns platform add android@next script: - - cd ../publish && sh pack.sh && cp package/*.tgz ../demo-angular/package.tgz - - cd ../demo-angular && tns plugin add package.tgz && npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot + - cd src && npm run build + - cd ../publish && sh pack.sh + - cd ../demo-angular && tns plugin add ../publish/package/*.tgz + - npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot - env: - BuildAndroid="28" - Type="VanillaJS" From 930ec7d9ef342b2c454120a157ed0057fa9cb800 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Thu, 31 Jan 2019 16:03:46 +0200 Subject: [PATCH 3/4] Fix: path to src in install script --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc8a860..4e89d5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ matrix: before_script: - cd ../demo-angular && tns platform add ios@next script: - - cd src && npm run build && npm pack + - cd ../src && npm run build && npm pack - cd ../demo-angular && tns plugin add ../src/*.tgz - npm i && tns build ios --bundle --env.uglify --env.aot - language: android @@ -67,7 +67,7 @@ matrix: before_script: - cd ../demo-angular && tns platform add android@next script: - - cd src && npm run build + - cd ../src && npm run build - cd ../publish && sh pack.sh - cd ../demo-angular && tns plugin add ../publish/package/*.tgz - npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot From 297e1c848c52ed71072480303e22933e0e30e01f Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Fri, 1 Feb 2019 09:00:03 +0200 Subject: [PATCH 4/4] Update capabilities for camera iOS --- .travis.yml | 2 +- demo/e2e/config/appium.capabilities.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e89d5a..41be4f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -137,7 +137,7 @@ matrix: script: - npm i -g appium - cd ../demo && npm i - - travis_wait travis_retry npm run e2e -- --runType sim.iPhone8.iOS11.2 --sauceLab --reuseDevice --appPath $IOS_PACKAGE_NEXT + - travis_wait travis_retry npm run e2e -- --runType sim.iPhoneX.iOS12 --sauceLab --reuseDevice --appPath $IOS_PACKAGE_NEXT android: components: diff --git a/demo/e2e/config/appium.capabilities.json b/demo/e2e/config/appium.capabilities.json index 55a7d0a..eb0d5fa 100644 --- a/demo/e2e/config/appium.capabilities.json +++ b/demo/e2e/config/appium.capabilities.json @@ -96,10 +96,10 @@ "deviceName": "iPhone 6", "app": "" }, - "sim.iPhone8.iOS110": { + "sim.iPhone8.iOS11.2": { "platformName": "iOS", - "platformVersion": "11.0", - "deviceName": "iPhone 8 110", + "platformVersion": "11.2", + "deviceName": "iPhone 8 112", "noReset": true, "fullReset": false, "app": ""