From b722d0205020348a6cbea0bdf24b67ec1d69697e Mon Sep 17 00:00:00 2001 From: Madana Gopal Date: Fri, 2 Aug 2019 06:51:26 +0530 Subject: [PATCH 01/16] edge artifacts update --- ci/release_osx.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ci/release_osx.sh b/ci/release_osx.sh index 4d2f79aa2a..9c3936c16c 100755 --- a/ci/release_osx.sh +++ b/ci/release_osx.sh @@ -2,12 +2,16 @@ if [ "$TRAVIS_EVENT_TYPE" != "cron" ] then export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/releases} +export RELEASE=1 else +export RELEASE=0 if [ "$TRAVIS_BRANCH" = "master" ] then -export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge/osx} +export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge/} +export LATEST_IMAGE=${LATEST_IMAGE:-/var/www/html/edge/osx} else -export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge_webgl/osx} +export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge_webgl/} +export LATEST_IMAGE=${LATEST_IMAGE:-/var/www/html/edge_webgl/osx} fi fi export DEPLOY_USER="${DEPLOY_USER:-ubuntu}" @@ -16,7 +20,7 @@ if [ "$TRAVIS_EVENT_TYPE" != "cron" ] then REMOTE_DIR="${DEPLOY_DESTINATION}/${PX_VERSION}" else -REMOTE_DIR="${DEPLOY_DESTINATION}" +REMOTE_DIR="${DEPLOY_DESTINATION}/${TRAVIS_BUILD_ID}-${TRAVIS_COMMIT}-${TRAVIS_OS_NAME}" fi #since we saved $1 to REMOTE_HOST delete it from args via shift export REMOTE_FILE_COUNT=$(ssh -o StrictHostKeyChecking=no -p 2220 ${DEPLOY_USER}@${REMOTE_HOST} "ls -lrt $DEPLOY_DESTINATION|wc -l") @@ -35,8 +39,13 @@ sudo tar -C $REMOTE_DIR -xvzf ${filename}; sudo mv $REMOTE_DIR/release/* $REMOTE_DIR/. ; sudo rm -rf $REMOTE_DIR/release; sudo rm -rf ${REMOTE_TEMPDIR}; +if [ $RELEASE -eq 0 ] +then +sudo rm -rf ${LATEST_IMAGE} +sudo ln -s ${REMOTE_DIR} ${LATEST_IMAGE} +fi echo $REMOTE_FILE_COUNT; -if [ $REMOTE_FILE_COUNT -gt 30 ] +if [ $REMOTE_FILE_COUNT -eq 8 ] then sudo rm -rf $REMOTE_FILE_OLD; fi From 18a62da4d289dd2fddb6c97acf54a17e01d72ddd Mon Sep 17 00:00:00 2001 From: Madana Gopal Date: Fri, 2 Aug 2019 06:51:26 +0530 Subject: [PATCH 02/16] edge artifacts update --- .travis.yml | 2 +- ci/release_osx.sh | 17 +++++++++++++---- pxscene-build.pem.enc | Bin 1680 -> 1696 bytes 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b210b8fced..a4b0bc85e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: language: c++ before_install: - eval "${MATRIX_EVAL}" -- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then openssl aes-256-cbc -K $encrypted_8b763c087de9_key -iv $encrypted_8b763c087de9_iv -in pxscene-build.pem.enc -out /tmp/pxscene-build.pem -d; fi +- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then openssl aes-256-cbc -K $encrypted_240941249744_key -iv $encrypted_240941249744_iv -in pxscene-build.pem.enc -out /tmp/pxscene-build.pem -d; fi - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then eval "$(ssh-agent -s)"; fi - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then chmod 0600 /tmp/pxscene-build.pem; fi - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then ssh-add /tmp/pxscene-build.pem; fi diff --git a/ci/release_osx.sh b/ci/release_osx.sh index 4d2f79aa2a..9c3936c16c 100755 --- a/ci/release_osx.sh +++ b/ci/release_osx.sh @@ -2,12 +2,16 @@ if [ "$TRAVIS_EVENT_TYPE" != "cron" ] then export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/releases} +export RELEASE=1 else +export RELEASE=0 if [ "$TRAVIS_BRANCH" = "master" ] then -export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge/osx} +export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge/} +export LATEST_IMAGE=${LATEST_IMAGE:-/var/www/html/edge/osx} else -export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge_webgl/osx} +export DEPLOY_DESTINATION=${DEPLOY_DESTINATION:-/var/www/html/edge_webgl/} +export LATEST_IMAGE=${LATEST_IMAGE:-/var/www/html/edge_webgl/osx} fi fi export DEPLOY_USER="${DEPLOY_USER:-ubuntu}" @@ -16,7 +20,7 @@ if [ "$TRAVIS_EVENT_TYPE" != "cron" ] then REMOTE_DIR="${DEPLOY_DESTINATION}/${PX_VERSION}" else -REMOTE_DIR="${DEPLOY_DESTINATION}" +REMOTE_DIR="${DEPLOY_DESTINATION}/${TRAVIS_BUILD_ID}-${TRAVIS_COMMIT}-${TRAVIS_OS_NAME}" fi #since we saved $1 to REMOTE_HOST delete it from args via shift export REMOTE_FILE_COUNT=$(ssh -o StrictHostKeyChecking=no -p 2220 ${DEPLOY_USER}@${REMOTE_HOST} "ls -lrt $DEPLOY_DESTINATION|wc -l") @@ -35,8 +39,13 @@ sudo tar -C $REMOTE_DIR -xvzf ${filename}; sudo mv $REMOTE_DIR/release/* $REMOTE_DIR/. ; sudo rm -rf $REMOTE_DIR/release; sudo rm -rf ${REMOTE_TEMPDIR}; +if [ $RELEASE -eq 0 ] +then +sudo rm -rf ${LATEST_IMAGE} +sudo ln -s ${REMOTE_DIR} ${LATEST_IMAGE} +fi echo $REMOTE_FILE_COUNT; -if [ $REMOTE_FILE_COUNT -gt 30 ] +if [ $REMOTE_FILE_COUNT -eq 8 ] then sudo rm -rf $REMOTE_FILE_OLD; fi diff --git a/pxscene-build.pem.enc b/pxscene-build.pem.enc index 179b2bc610235c58909363dc18216a723bfb9206..8f3b12918eec1496c1936d8cef68fb6a6af3b038 100644 GIT binary patch literal 1696 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 aC@ Date: Fri, 2 Aug 2019 17:11:53 +0530 Subject: [PATCH 03/16] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e4b6482637..d0bf5b12af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: language: c++ before_install: - eval "${MATRIX_EVAL}" -- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then openssl aes-256-cbc -K $encrypted_240941249744_key -iv $encrypted_240941249744_iv -in pxscene-build.pem.enc -out /tmp/pxscene-build.pem -d; fi +- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then openssl aes-256-cbc -K $encrypted_8b763c087de9_key -iv $encrypted_8b763c087de9_iv -in pxscene-build.pem.enc -out /tmp/pxscene-build.pem -d; fi - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then eval "$(ssh-agent -s)"; fi - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then chmod 0600 /tmp/pxscene-build.pem; fi - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then ssh-add /tmp/pxscene-build.pem; fi From 209614b2de5bc4676829dd7f3ab11484a230602f Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Fri, 2 Aug 2019 17:12:22 +0530 Subject: [PATCH 04/16] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d0bf5b12af..dd7c18e2e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,3 +44,5 @@ addons: notifications: slack: secure: gQ7GjheuN4j98co71p1gO0QaIAX3xHnDE2JRTT5UopsPbhczBC3A6RlVhXBrIc9mDyt2AO/pTBOl68BGtwtb4NVhZo2fqCcoq4wk2U2bAH3OnQu5KE9fJxm1KdJi0WiFVy1pURQql1fUH800YqF1LOWbc9m8aexgcvtD6ghDFLCDStgqfNgRzSEbZ8YBP98FjkEHj/jjeqwdUaH0Aezv0n82Laev99KDveCTVMoKXcbyfBQK0ty3OFAg6nBrMWPx0RVDVOVFPjjXDFgC5UfS9FLA57bxRDVmDr8SMnS/7m26YH0jnqY4oS1QnEmrdUtp6UWNex8D88KCt+wXoOpd6Ca1DVHNnaFuotEVpJ8B3WEG3uiK6xvacpkMrtEuoswUIbOv8E1VdfF3eOSmSAneb09Nbs15U8yiBfNq4PLE8TYc22or5jDsksTyGgmOgE1m8teH4DQz+k5qhMihd9f88CqaWzkjNgucavr/QzXG16xt13unMmMD0/bzA7wDU3hprne5hycR0LDxFRlL5z5xdv4w9yseuFTYBRcQ5Lk9zA6gJUMCGcbCtfA2rYQS7lOul575EMX7SfagHMmn663QY3tzm+vsxF93Dib+xfsAI3xSxSKGeBNZ5H9MxUPNUcu1yxhDZIZX8HujsDVLfIm/VK9OS2ultBTYeKizlyPBBsM= + +cache: ccache From 636094122b5c45bb0f9329bd8a7bd5cce3dd1176 Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Fri, 2 Aug 2019 17:12:38 +0530 Subject: [PATCH 05/16] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd7c18e2e4..b210b8fced 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,5 +44,4 @@ addons: notifications: slack: secure: gQ7GjheuN4j98co71p1gO0QaIAX3xHnDE2JRTT5UopsPbhczBC3A6RlVhXBrIc9mDyt2AO/pTBOl68BGtwtb4NVhZo2fqCcoq4wk2U2bAH3OnQu5KE9fJxm1KdJi0WiFVy1pURQql1fUH800YqF1LOWbc9m8aexgcvtD6ghDFLCDStgqfNgRzSEbZ8YBP98FjkEHj/jjeqwdUaH0Aezv0n82Laev99KDveCTVMoKXcbyfBQK0ty3OFAg6nBrMWPx0RVDVOVFPjjXDFgC5UfS9FLA57bxRDVmDr8SMnS/7m26YH0jnqY4oS1QnEmrdUtp6UWNex8D88KCt+wXoOpd6Ca1DVHNnaFuotEVpJ8B3WEG3uiK6xvacpkMrtEuoswUIbOv8E1VdfF3eOSmSAneb09Nbs15U8yiBfNq4PLE8TYc22or5jDsksTyGgmOgE1m8teH4DQz+k5qhMihd9f88CqaWzkjNgucavr/QzXG16xt13unMmMD0/bzA7wDU3hprne5hycR0LDxFRlL5z5xdv4w9yseuFTYBRcQ5Lk9zA6gJUMCGcbCtfA2rYQS7lOul575EMX7SfagHMmn663QY3tzm+vsxF93Dib+xfsAI3xSxSKGeBNZ5H9MxUPNUcu1yxhDZIZX8HujsDVLfIm/VK9OS2ultBTYeKizlyPBBsM= - cache: ccache From 02ef2e08c4f7dfac820a6b5e62c41f6a21e3f3ac Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Fri, 2 Aug 2019 17:13:04 +0530 Subject: [PATCH 06/16] Update after_script.sh --- ci/after_script.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/after_script.sh b/ci/after_script.sh index 968e963722..2bd090fa06 100755 --- a/ci/after_script.sh +++ b/ci/after_script.sh @@ -42,8 +42,11 @@ then checkError $? "unable to move artifacts folder to release directory" "artifacts directory created" "Retry" tar -cvzf release.tgz release/* checkError $? "unable to compress release folder" "release folder present?" "Retry" - ./ci/release_osx.sh 96.116.56.119 release.tgz - checkError $? "unable to send artifacts to 96.116.56.119" "96.116.56.119 down?" "Retry" + if [ "$TRAVIS_REPO_SLUG" = "pxscene/pxCore" ] && ( [ "$TRAVIS_BRANCH" = "master" ] || [ "$TRAVIS_BRANCH" = "_webgl" ] || [ "$TRAVIS_BRANCH" = "$TRAVIS_TAG" ] ); + then + ./ci/release_osx.sh 96.116.56.119 release.tgz + checkError $? "unable to send artifacts to 96.116.56.119" "96.116.56.119 down?" "Retry" + fi fi if ( [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] ) && [ -z "${TRAVIS_TAG}" ] From 66612bc2745bc4bd1079f7a7b4f3927cc7b3bbca Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Tue, 6 Aug 2019 14:16:53 +0530 Subject: [PATCH 07/16] Update execute_linux.sh --- ci/execute_linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/execute_linux.sh b/ci/execute_linux.sh index bbb786973f..841127f9b9 100755 --- a/ci/execute_linux.sh +++ b/ci/execute_linux.sh @@ -1,4 +1,5 @@ #!/bin/sh + checkError() { if [ "$1" -ne 0 ] From 9c1d822cd451454d22a75b360ad05b4846fbfdfd Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Tue, 6 Aug 2019 19:13:35 +0530 Subject: [PATCH 08/16] Update install.sh --- ci/install.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/install.sh b/ci/install.sh index 777d725b4d..2edb2eb5b0 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -2,9 +2,6 @@ checkError() { - cd $TRAVIS_BUILD_DIR/examples/pxScene2d/external/curl - cat config.log - cd $TRAVIS_BUILD_DIR if [ "$1" -ne 0 ] then printf "\n\n*********************************************************************"; From 2adb9872ebe8cb6b4a98d7c4e7428c2412b7322f Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Tue, 6 Aug 2019 19:56:02 +0530 Subject: [PATCH 09/16] Update build.sh --- examples/pxScene2d/external/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/pxScene2d/external/build.sh b/examples/pxScene2d/external/build.sh index 173f4c77f2..2197c92790 100755 --- a/examples/pxScene2d/external/build.sh +++ b/examples/pxScene2d/external/build.sh @@ -63,6 +63,7 @@ cd .. unset CCACHE_DISABLE export LD_LIBRARY_PATH="${OPENSSL_DIR}/:$LD_LIBRARY_PATH" export DYLD_LIBRARY_PATH="${OPENSSL_DIR}/:$DYLD_LIBRARY_PATH" + #--------- CURL if [ ! -e ./curl/lib/.libs/libcurl.4.dylib ] || From e5cb55b1da0bb9991f0b0b9fadcc75bb5b2cc5f0 Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Wed, 7 Aug 2019 09:17:35 +0530 Subject: [PATCH 10/16] Update build.sh --- examples/pxScene2d/external/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/pxScene2d/external/build.sh b/examples/pxScene2d/external/build.sh index 2197c92790..bb10e95094 100755 --- a/examples/pxScene2d/external/build.sh +++ b/examples/pxScene2d/external/build.sh @@ -44,6 +44,7 @@ fi #--------- OPENSSL +#avoid caching for openssl export CCACHE_DISABLE=true cd ${OPENSSL_DIR} if [ "$(uname)" != "Darwin" ] From 6b9ad1510a193dce7c0f0fe4462004d5310b7887 Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Wed, 7 Aug 2019 20:48:57 +0530 Subject: [PATCH 11/16] Update build.sh --- examples/pxScene2d/external/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pxScene2d/external/build.sh b/examples/pxScene2d/external/build.sh index bb10e95094..79548023dd 100755 --- a/examples/pxScene2d/external/build.sh +++ b/examples/pxScene2d/external/build.sh @@ -58,7 +58,7 @@ make "-j${make_parallel}" make install -i rm -rf libcrypto.a rm -rf libssl.a -rm -rf lib/ibcrypto.a +rm -rf lib/libcrypto.a rm -rf lib/libssl.a cd .. unset CCACHE_DISABLE From efe740351af379336be777fcf4e27da30f696383 Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Tue, 20 Aug 2019 14:56:01 +0530 Subject: [PATCH 12/16] Update node_worker.cc --- examples/pxScene2d/external/libnode-v10.15.3/src/node_worker.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/pxScene2d/external/libnode-v10.15.3/src/node_worker.cc b/examples/pxScene2d/external/libnode-v10.15.3/src/node_worker.cc index 97b3344974..91ef9f2a96 100755 --- a/examples/pxScene2d/external/libnode-v10.15.3/src/node_worker.cc +++ b/examples/pxScene2d/external/libnode-v10.15.3/src/node_worker.cc @@ -69,7 +69,6 @@ Worker::Worker(Environment* env, Local wrap, const std::string& url) : AsyncWrap(env, wrap, AsyncWrap::PROVIDER_WORKER), url_(url) { // Generate a new thread id. { - printf("hello \n"); fflush(stdout); Mutex::ScopedLock next_thread_id_lock(next_thread_id_mutex); thread_id_ = next_thread_id++; } From f5ce06a7ab13e72d85a101cf21526c832d7ada01 Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Tue, 20 Aug 2019 14:56:17 +0530 Subject: [PATCH 13/16] Update before_install.sh --- ci/before_install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/before_install.sh b/ci/before_install.sh index 9bcbc65b08..1f70c3fbf2 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -1,6 +1,5 @@ #!/bin/sh -#hi travis_retry() { local result=0 local count=1 From 4e99cf115b6dda3e6cbeecb77b836d3aa917d5ee Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Tue, 20 Aug 2019 14:56:31 +0530 Subject: [PATCH 14/16] Update monitor.sh --- ci/monitor.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/monitor.sh b/ci/monitor.sh index 3883702f9a..1c01ebbefd 100755 --- a/ci/monitor.sh +++ b/ci/monitor.sh @@ -1,5 +1,4 @@ #!/bin/sh - count=0 while [ "$count" -le 3600 ]; do sleep 60; From 285d524069a5327169f419bc31ab397070c775f3 Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Tue, 20 Aug 2019 15:34:03 +0530 Subject: [PATCH 15/16] Update monitor.sh --- ci/monitor.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/monitor.sh b/ci/monitor.sh index 1c01ebbefd..6a4d2f39ff 100755 --- a/ci/monitor.sh +++ b/ci/monitor.sh @@ -4,7 +4,4 @@ while [ "$count" -le 3600 ]; do sleep 60; count=$((count+60)) echo "travis activities running for $count seconds" - if [ "$count" -ge 800 ]; then - top -b - fi done From 5681a8c41f85c8d87f45ffbd0cedcf2e9d42f702 Mon Sep 17 00:00:00 2001 From: madanagopaltcomcast <35588028+madanagopaltcomcast@users.noreply.github.com> Date: Tue, 20 Aug 2019 16:51:34 +0530 Subject: [PATCH 16/16] Update build.sh --- examples/pxScene2d/external/build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/examples/pxScene2d/external/build.sh b/examples/pxScene2d/external/build.sh index 79548023dd..2656a0188e 100755 --- a/examples/pxScene2d/external/build.sh +++ b/examples/pxScene2d/external/build.sh @@ -44,8 +44,6 @@ fi #--------- OPENSSL -#avoid caching for openssl -export CCACHE_DISABLE=true cd ${OPENSSL_DIR} if [ "$(uname)" != "Darwin" ] then @@ -61,7 +59,6 @@ rm -rf libssl.a rm -rf lib/libcrypto.a rm -rf lib/libssl.a cd .. -unset CCACHE_DISABLE export LD_LIBRARY_PATH="${OPENSSL_DIR}/:$LD_LIBRARY_PATH" export DYLD_LIBRARY_PATH="${OPENSSL_DIR}/:$DYLD_LIBRARY_PATH"