diff options
| author | Michael Pavone <pavone@retrodev.com> | 2017-02-27 00:28:05 -0800 |
|---|---|---|
| committer | Michael Pavone <pavone@retrodev.com> | 2017-02-27 00:28:05 -0800 |
| commit | abffe25f9d9649da0cb27c5b1d4699b1ef78fb58 (patch) | |
| tree | d0a57f1ebdb6e02afea34fff55620208655d6dbe | |
| parent | bd2fcaed78f4d4c3a887c83a2a44e92b2f7e1744 (diff) | |
More logging. Fix path in upload step of build_upload_win_nightly
| -rwxr-xr-x | build_upload_nightly | 7 | ||||
| -rwxr-xr-x | build_upload_win_nightly | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/build_upload_nightly b/build_upload_nightly index 6a82a51..7d392c1 100755 --- a/build_upload_nightly +++ b/build_upload_nightly @@ -9,9 +9,10 @@ if [ $? -ne 0 ]; then fi sleep 10 echo Starting build by $BUILD_USER in $CONTAINER_NAME -lxc-attach -n "$CONTAINER_NAME" -- /home/$BUILD_USER/blastem/build_nightly $BUILD_USER > /tmp/build_${name}_out.log -if [ $? -ne 0 ]; then - echo Build falied with return code $? stopping $CONTAINER_NAME +lxc-attach -n "$CONTAINER_NAME" -- /home/$BUILD_USER/blastem/build_nightly $BUILD_USER 2>&1 > /tmp/build_${name}_out.log +result=$? +if [ $result -ne 0 ]; then + echo Build falied with return code $result stopping $CONTAINER_NAME lxc-stop -n "$CONTAINER_NAME" exit $? fi diff --git a/build_upload_win_nightly b/build_upload_win_nightly index a296f93..9c6cce1 100755 --- a/build_upload_win_nightly +++ b/build_upload_win_nightly @@ -9,6 +9,12 @@ rev=`hg summary | sed -E -n 's/^parent: [^:]+:([^ ]+) .*$/\1/p'` sed -i -E "s/(define BLASTEM_VERSION \"[^-]+)-pre\"/\1-pre-$rev\"/" blastem.c export OS=Windows ./build_release > /tmp/build_${name}_out.log +result=$? +if [ $result -ne 0 ]; then + echo Build falied with return code $result + exit $result +fi . $HOME/remote.params artifact=$(tail -n 1 /tmp/build_${name}_out.log) -scp -i "$REMOTE_IDENT" "$HOME/.local/share/lxc/$CONTAINER_NAME/rootfs/home/$BUILD_USER/blastem/$artifact" $REMOTE_USER@$REMOTE_HOST:/home/$REMOTE_USER/nightlies +echo "Uploaing $artifact to $REMOTE_HOST" +scp -i "$REMOTE_IDENT" "$HOME/blastem_win/$artifact" $REMOTE_USER@$REMOTE_HOST:/home/$REMOTE_USER/nightlies |