summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorMike Morris <mikemorris@users.noreply.github.com>2016-11-14 13:36:57 -0500
committerMike Morris <mikemorris@users.noreply.github.com>2016-11-15 13:31:48 -0500
commitf50de162607ee97b44ef3f5605a166da1bb7ecc3 (patch)
treee212e4cea3cf119baa67fd883f72f688adf078df /platform
parent1d80be00df7ebbd4acf99a7aa63900597b903e40 (diff)
downloadqtlocation-mapboxgl-f50de162607ee97b44ef3f5605a166da1bb7ecc3.tar.gz
[node] publish Node.js Linux binaries with GLX
run test suite with OSMesa in Debug
Diffstat (limited to 'platform')
-rw-r--r--platform/node/bitrise.yml3
-rwxr-xr-xplatform/node/scripts/after_script.sh19
-rwxr-xr-xplatform/node/scripts/after_success.sh13
3 files changed, 20 insertions, 15 deletions
diff --git a/platform/node/bitrise.yml b/platform/node/bitrise.yml
index af22fe65ea..23158eb60c 100644
--- a/platform/node/bitrise.yml
+++ b/platform/node/bitrise.yml
@@ -56,6 +56,7 @@ workflows:
#!/bin/bash
set -eu -o pipefail
make test-node || envman add --key RESULT --value $?
+ ./platform/node/scripts/after_script.sh ${BITRISE_BUILD_NUMBER}
- script:
title: Run publish script
run_if: '{{enveq "SKIPCI" "false"}}'
@@ -63,7 +64,7 @@ workflows:
- content: |-
#!/bin/bash
set -eu -o pipefail
- ./platform/node/scripts/after_script.sh ${BITRISE_BUILD_NUMBER}
+ ./platform/node/scripts/after_success.sh
exit ${RESULT:-0}
- slack:
title: Post to Slack
diff --git a/platform/node/scripts/after_script.sh b/platform/node/scripts/after_script.sh
index c805e453a2..4228d13dfe 100755
--- a/platform/node/scripts/after_script.sh
+++ b/platform/node/scripts/after_script.sh
@@ -5,19 +5,10 @@ set -o pipefail
JOB=$1
-if [[ -n ${PUBLISH:-} ]]; then
- if [[ "${BUILDTYPE}" == "Debug" ]]; then
- echo "Please run this script in release mode (BUILDTYPE=Release)."
- exit 1
- else
- ./node_modules/.bin/node-pre-gyp package publish info
- fi
-else
- if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
- gzip --stdout node_modules/mapbox-gl-test-suite/render-tests/index.html | \
- aws s3 cp --acl public-read --content-encoding gzip --content-type text/html \
- - s3://mapbox/mapbox-gl-native/render-tests/$JOB/index.html
+if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
+ gzip --stdout node_modules/mapbox-gl-test-suite/render-tests/index.html | \
+ aws s3 cp --acl public-read --content-encoding gzip --content-type text/html \
+ - s3://mapbox/mapbox-gl-native/render-tests/$JOB/index.html
- echo http://mapbox.s3.amazonaws.com/mapbox-gl-native/render-tests/$JOB/index.html
- fi
+ echo http://mapbox.s3.amazonaws.com/mapbox-gl-native/render-tests/$JOB/index.html
fi
diff --git a/platform/node/scripts/after_success.sh b/platform/node/scripts/after_success.sh
new file mode 100755
index 0000000000..7ef8f53545
--- /dev/null
+++ b/platform/node/scripts/after_success.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+set -o pipefail
+
+if [[ -n ${PUBLISH:-} ]]; then
+ if [[ "${BUILDTYPE}" == "Debug" ]]; then
+ echo "Please run this script in release mode (BUILDTYPE=Release)."
+ exit 1
+ else
+ ./node_modules/.bin/node-pre-gyp package publish info
+ fi
+fi