From 02aed778bc2548c6d27f6d46d9158b6701a968b7 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Tue, 5 Jun 2018 14:06:55 -0400 Subject: [PATCH] Output errors on stderr. --- .gitlab-ci.yml | 18 ------------------ platform-darwin/Scripts/genassets | 7 +------ platform-darwin/Scripts/updatePlist | 2 +- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 347a380e..6cc5b71a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,10 +3,6 @@ variables: JEKYLL_ENV: production GIT_SUBMODULE_STRATEGY: recursive -stages: - - build - - deploy - build_project: stage: build script: @@ -20,17 +16,3 @@ build_project: - brew - java - xcode_9 - only: - - master - -pages: - stage: deploy - script: - - exec jekyll build -d public - artifacts: - paths: - - public - tags: - - jekyll - only: - - gh-pages diff --git a/platform-darwin/Scripts/genassets b/platform-darwin/Scripts/genassets index 3f1436c3..cdf66095 100755 --- a/platform-darwin/Scripts/genassets +++ b/platform-darwin/Scripts/genassets @@ -2,15 +2,10 @@ # See https://developer.apple.com/library/ios/qa/qa1686/_index.html cd "${BASH_SOURCE%/*}" source bashlib -trap 'c=$BASH_COMMAND s=$?; echo "EXIT: $s: $c"; exit $s' EXIT +trap 'c=$BASH_COMMAND s=$?; (( s )) && echo >&2 "ERROR: $s: $c"; exit $s' EXIT set -e cd .. export PATH+=:/usr/local/bin -echo >&2 "stderr" -echo "stdout" -echo "== declare -xp ==" -declare -xp -echo "== declare -xp ==" # icons format: [pixel size]@[scale]@[idiom]@[os]:[filename] -- if os is "anything lower", omit it icons=( diff --git a/platform-darwin/Scripts/updatePlist b/platform-darwin/Scripts/updatePlist index 85cd1c52..3cf97c50 100755 --- a/platform-darwin/Scripts/updatePlist +++ b/platform-darwin/Scripts/updatePlist @@ -1,7 +1,7 @@ #!/usr/bin/env bash cd "${BASH_SOURCE%/*}" source ./bashlib -trap 'c=$BASH_COMMAND s=$?; (( s )) && echo "ERROR: $s: $c"; exit $s' EXIT +trap 'c=$BASH_COMMAND s=$?; (( s )) && echo >&2 "ERROR: $s: $c"; exit $s' EXIT set -e cd .. export PATH+=:/usr/libexec