From ad9cc2a604090efb08d2e4ebacc287cc975a62dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Fri, 14 Jul 2017 15:26:59 +0200 Subject: [PATCH 01/17] trigger test on android devices --- .gitignore | 1 + mobile_test.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7581d8e..d6d233d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.idea/ node_modules/ platforms/ plugins/ diff --git a/mobile_test.json b/mobile_test.json index 891237b..e12521b 100755 --- a/mobile_test.json +++ b/mobile_test.json @@ -4,7 +4,7 @@ "ios": "platforms/ios/build/device/HelloWorld.app", "android": "platforms/android/build/outputs/apk/android-release-unsigned.apk" }, - "target": "all", + "target": "android", "priority": "normal", "csname": { "android": "com.example.hello", "ios": "com.example.hello" }, "timeout": 150, From 7898e76bb4e82a2b2bbc7950f4d6d2a3c0c01467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Fri, 14 Jul 2017 15:51:37 +0200 Subject: [PATCH 02/17] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 714eb35..88a1d8a 100755 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -#NO LONGER NEEDED.... +#NO LONGER NEEDED..... From eab3326dbd99c64e16815c29cc4096d525c65cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Fri, 14 Jul 2017 16:03:55 +0200 Subject: [PATCH 03/17] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 88a1d8a..714eb35 100755 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -#NO LONGER NEEDED..... +#NO LONGER NEEDED.... From 18a8dcee3283510947d40eb5c60ba67d560061f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Fri, 14 Jul 2017 16:10:20 +0200 Subject: [PATCH 04/17] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 714eb35..88a1d8a 100755 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -#NO LONGER NEEDED.... +#NO LONGER NEEDED..... From 47593fb89bbf7897d43fec95e2e329778f70da27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Mon, 17 Jul 2017 11:09:52 +0200 Subject: [PATCH 05/17] trigger android buid --- build.sh | 39 ++++++++++++++++++++++++++++++++++++++- build_droid.sh | 4 ++++ build_ios.sh | 2 -- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 88a1d8a..f69b751 100755 --- a/build.sh +++ b/build.sh @@ -1 +1,38 @@ -#NO LONGER NEEDED..... +#!/bin/sh + +### START - JXcore Test Server -------- +### Testing environment prepares separate packages for each node. +### Package builder calls this script with each node's IP address +### Make sure multiple calls to this script file compiles the application file + +NORMAL_COLOR='\033[0m' +RED_COLOR='\033[0;31m' +GREEN_COLOR='\033[0;32m' +GRAY_COLOR='\033[0;37m' + +LOG() { + COLOR="$1" + TEXT="$2" + echo -e "${COLOR}$TEXT ${NORMAL_COLOR}" +} + + +ERROR_ABORT() { + if [[ $? != 0 ]] + then + LOG $RED_COLOR "compilation aborted\n" + exit -1 + fi +} +### END - JXcore Test Server -------- + +cordova platform remove ios;ERROR_ABORT +cordova platform remove android;ERROR_ABORT +cordova plugin remove io.jxcore.node;ERROR_ABORT +cordova plugin add io.jxcore.node/;ERROR_ABORT +cordova platform add android;ERROR_ABORT +cordova build android --release --device;ERROR_ABORT + +echo "copying Android build for CI" +rm -rf android-release-unsigned.apk +cp -R ../testdummy/platforms/android/build/outputs/apk/android-release-unsigned.apk android-release-unsigned.apk diff --git a/build_droid.sh b/build_droid.sh index bfd0c4d..f69b751 100755 --- a/build_droid.sh +++ b/build_droid.sh @@ -32,3 +32,7 @@ cordova plugin remove io.jxcore.node;ERROR_ABORT cordova plugin add io.jxcore.node/;ERROR_ABORT cordova platform add android;ERROR_ABORT cordova build android --release --device;ERROR_ABORT + +echo "copying Android build for CI" +rm -rf android-release-unsigned.apk +cp -R ../testdummy/platforms/android/build/outputs/apk/android-release-unsigned.apk android-release-unsigned.apk diff --git a/build_ios.sh b/build_ios.sh index 0a039a3..ea364a5 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -28,7 +28,5 @@ ERROR_ABORT() { cordova platform remove ios;ERROR_ABORT cordova platform remove android;ERROR_ABORT -cordova plugin remove io.jxcore.node;ERROR_ABORT -cordova plugin add io.jxcore.node/;ERROR_ABORT cordova platform add ios;ERROR_ABORT cordova build ios --device;ERROR_ABORT From 5c6611874b6a7256e2247b52b374a1b91e6681f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Mon, 17 Jul 2017 11:54:32 +0200 Subject: [PATCH 06/17] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f69b751..2ae9a3e 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -### START - JXcore Test Server -------- +### START - JXcore Test Server --------- ### Testing environment prepares separate packages for each node. ### Package builder calls this script with each node's IP address ### Make sure multiple calls to this script file compiles the application file From c1783382479db696a6e5439db34006605cfd2ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Mon, 17 Jul 2017 11:55:05 +0200 Subject: [PATCH 07/17] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 2ae9a3e..f69b751 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -### START - JXcore Test Server --------- +### START - JXcore Test Server -------- ### Testing environment prepares separate packages for each node. ### Package builder calls this script with each node's IP address ### Make sure multiple calls to this script file compiles the application file From 81d7c01df5d78a97ac1d0d2b1508b9ababb9aa15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Mon, 17 Jul 2017 12:04:09 +0200 Subject: [PATCH 08/17] removed io.jxcore.node plugin --- build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.sh b/build.sh index f69b751..6c75e29 100755 --- a/build.sh +++ b/build.sh @@ -28,8 +28,6 @@ ERROR_ABORT() { cordova platform remove ios;ERROR_ABORT cordova platform remove android;ERROR_ABORT -cordova plugin remove io.jxcore.node;ERROR_ABORT -cordova plugin add io.jxcore.node/;ERROR_ABORT cordova platform add android;ERROR_ABORT cordova build android --release --device;ERROR_ABORT From d4f0122b70fc3af123123a60553da5ce701fcbdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Mon, 17 Jul 2017 12:10:30 +0200 Subject: [PATCH 09/17] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 6c75e29..8efa830 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -### START - JXcore Test Server -------- +### START - JXcore Test Server --------- ### Testing environment prepares separate packages for each node. ### Package builder calls this script with each node's IP address ### Make sure multiple calls to this script file compiles the application file From 4cd4c677c562e63f3ffe757321f1fc7edec0feda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Mon, 17 Jul 2017 13:57:04 +0200 Subject: [PATCH 10/17] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 8efa830..e86b55c 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -### START - JXcore Test Server --------- +### START - JXcore Test Server ---------- ### Testing environment prepares separate packages for each node. ### Package builder calls this script with each node's IP address ### Make sure multiple calls to this script file compiles the application file From 7612ee45f7446f484ed3ea788959aabde4e755ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Mon, 17 Jul 2017 14:01:23 +0200 Subject: [PATCH 11/17] updated --- build_droid.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/build_droid.sh b/build_droid.sh index f69b751..6c75e29 100755 --- a/build_droid.sh +++ b/build_droid.sh @@ -28,8 +28,6 @@ ERROR_ABORT() { cordova platform remove ios;ERROR_ABORT cordova platform remove android;ERROR_ABORT -cordova plugin remove io.jxcore.node;ERROR_ABORT -cordova plugin add io.jxcore.node/;ERROR_ABORT cordova platform add android;ERROR_ABORT cordova build android --release --device;ERROR_ABORT From 91e87442108f720d0b42ad639dedc74f00feb1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Mon, 17 Jul 2017 14:23:20 +0200 Subject: [PATCH 12/17] update --- build.sh | 37 +------------------------------------ build_droid.sh | 2 +- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/build.sh b/build.sh index e86b55c..714eb35 100755 --- a/build.sh +++ b/build.sh @@ -1,36 +1 @@ -#!/bin/sh - -### START - JXcore Test Server ---------- -### Testing environment prepares separate packages for each node. -### Package builder calls this script with each node's IP address -### Make sure multiple calls to this script file compiles the application file - -NORMAL_COLOR='\033[0m' -RED_COLOR='\033[0;31m' -GREEN_COLOR='\033[0;32m' -GRAY_COLOR='\033[0;37m' - -LOG() { - COLOR="$1" - TEXT="$2" - echo -e "${COLOR}$TEXT ${NORMAL_COLOR}" -} - - -ERROR_ABORT() { - if [[ $? != 0 ]] - then - LOG $RED_COLOR "compilation aborted\n" - exit -1 - fi -} -### END - JXcore Test Server -------- - -cordova platform remove ios;ERROR_ABORT -cordova platform remove android;ERROR_ABORT -cordova platform add android;ERROR_ABORT -cordova build android --release --device;ERROR_ABORT - -echo "copying Android build for CI" -rm -rf android-release-unsigned.apk -cp -R ../testdummy/platforms/android/build/outputs/apk/android-release-unsigned.apk android-release-unsigned.apk +#NO LONGER NEEDED.... diff --git a/build_droid.sh b/build_droid.sh index 6c75e29..b088476 100755 --- a/build_droid.sh +++ b/build_droid.sh @@ -33,4 +33,4 @@ cordova build android --release --device;ERROR_ABORT echo "copying Android build for CI" rm -rf android-release-unsigned.apk -cp -R ../testdummy/platforms/android/build/outputs/apk/android-release-unsigned.apk android-release-unsigned.apk +cp -R ../testBuild/platforms/android/build/outputs/apk/android-release-unsigned.apk android-release-unsigned.apk From 85a01a368bdc1b17783e9a1d80b20166686e100c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Mon, 17 Jul 2017 14:34:12 +0200 Subject: [PATCH 13/17] update --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 714eb35..88a1d8a 100755 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -#NO LONGER NEEDED.... +#NO LONGER NEEDED..... From c7d4296004291b74db70284b6b1753d9eecd35d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Mon, 17 Jul 2017 15:22:41 +0200 Subject: [PATCH 14/17] retry --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 88a1d8a..8a57649 100755 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -#NO LONGER NEEDED..... +#NO LONGER NEEDED...... From 42a01a07ae780e145da47746e17a67eb4b06f918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Tue, 18 Jul 2017 07:54:42 +0200 Subject: [PATCH 15/17] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 8a57649..0f6e3fb 100755 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -#NO LONGER NEEDED...... +#NO LONGER NEEDED....... From a18bb20c92262761c9121fdeea912fb84c69dea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Tue, 18 Jul 2017 09:24:21 +0200 Subject: [PATCH 16/17] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 0f6e3fb..e68b374 100755 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -#NO LONGER NEEDED....... +#NO LONGER NEEDED........ From 2ce07bc8c51fb2a573308ba8fbdd79d60b5bbd82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20S=C5=82ota?= Date: Tue, 18 Jul 2017 10:19:11 +0200 Subject: [PATCH 17/17] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index e68b374..0f6e3fb 100755 --- a/build.sh +++ b/build.sh @@ -1 +1 @@ -#NO LONGER NEEDED........ +#NO LONGER NEEDED.......