From 6ca20b124d80fda1a3db3cd9c28d9d8e5393484e Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Thu, 14 Jun 2018 10:16:16 +0300 Subject: [PATCH 1/2] chore: add build with 'next' versions --- .gitattributes | 1 + .travis.yml | 44 +++++++++++++++++++++++++++++---------- demo-angular/package.json | 2 +- 3 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..317a26c --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.travis.yml merge=ours \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 9afcc49..af14307 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,39 +1,54 @@ +branches: + only: + - next matrix: include: - - stage: "WebPack, Build and Test" + - stage: "WebPack and Build" os: osx env: - WebPack="iOS" osx_image: xcode9.2 language: node_js - node_js: "6" + node_js: "8" jdk: oraclejdk8 - script: cd src && npm i && cd ../demo && npm i && tns build ios --bundle --env.uglify && cd ../demo-angular && npm i && tns build ios --bundle --env.uglify --env.aot + before_script: + - cd ../demo && tns platform add ios@next + - cd ../demo-angular && tns platform add ios@next + script: cd ../src && npm i && cd ../demo && npm i && tns build ios --bundle --env.uglify && cd ../demo-angular && npm i && tns build ios --bundle --env.uglify --env.aot - language: android os: linux env: - WebPack="Android" jdk: oraclejdk8 - before_install: nvm install 6.10.3 - script: cd src && npm i && cd ../demo && npm i && tns build android --bundle --env.uglify --env.snapshot && cd ../demo-angular && tns build android --bundle --env.uglify --env.snapshot --env.aot + before_install: nvm install 8.9.4 + before_script: + - cd ../demo && tns platform add android@next + - cd ../demo-angular && tns platform add android@next + script: cd ../src && npm i && cd ../demo && npm i && tns build android --bundle --env.uglify --env.snapshot && cd ../demo-angular && tns build android --bundle --env.uglify --env.snapshot --env.aot - language: android env: - BuildAndroid="26" os: linux jdk: oraclejdk8 - before_install: nvm install stable + before_install: nvm install 8.9.4 + before_script: + - cd ../demo && tns platform add android@next + - cd ../demo-angular && tns platform add android@next script: - - cd src && npm i && cd ../demo && tns build android && cd ../demo-angular && tns build android + - cd ../src && npm i && cd ../demo && tns build android && cd ../demo-angular && tns build android - os: osx env: - BuildiOS="11" - Xcode="9.2" osx_image: xcode9.2 language: node_js - node_js: "6" + node_js: "8" jdk: oraclejdk8 + before_script: + - cd ../demo && tns platform add ios@next + - cd ../demo-angular && tns platform add ios@next script: - - cd src && npm i && cd ../demo && tns build ios && cd ../demo-angular && tns build ios + - cd ../src && npm i && cd ../demo && tns build ios && cd ../demo-angular && tns build ios android: components: @@ -45,6 +60,13 @@ android: - extra-android-m2repository install: - - echo no | npm install -g nativescript + - echo no | npm install -g nativescript@next - tns usage-reporting disable - - tns error-reporting disable \ No newline at end of file + - tns error-reporting disable + - cd demo + - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P + - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D + - cd ../demo-angular + - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P + - npm uninstall nativescript-angular -P && npm install nativescript-angular@next -P + - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D \ No newline at end of file diff --git a/demo-angular/package.json b/demo-angular/package.json index c44b670..cbebedb 100644 --- a/demo-angular/package.json +++ b/demo-angular/package.json @@ -26,7 +26,7 @@ "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.10", "rxjs": "~6.0.0 || >=6.1.0", - "tns-core-modules": "4.0.1", + "tns-core-modules": "^4.0.1", "zone.js": "^0.8.26" }, "devDependencies": { From 3bef274f9dd81d7cf1c277eb9fb303776329e66f Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Fri, 15 Jun 2018 13:05:38 +0300 Subject: [PATCH 2/2] fix: travis webpack with next of webpack --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index af14307..0003831 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,9 +64,11 @@ install: - tns usage-reporting disable - tns error-reporting disable - cd demo - - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P - - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D + - npm install tns-core-modules@next -P + - npm install nativescript-dev-webpack@next -D + - ./node_modules/.bin/update-ns-webpack --deps - cd ../demo-angular - - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P - - npm uninstall nativescript-angular -P && npm install nativescript-angular@next -P - - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D \ No newline at end of file + - npm install tns-core-modules@next -P + - npm install nativescript-angular@next -P + - npm install nativescript-dev-webpack@next -D + - ./node_modules/.bin/update-ns-webpack --deps \ No newline at end of file