Mercurial > repos > blastem
changeset 1251:f249fd91b0f5
More logging. Fix path in upload step of build_upload_win_nightly
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Mon, 27 Feb 2017 00:28:05 -0800 |
| parents | 738c8aa2c741 |
| children | 8e3adc6264d3 |
| files | build_upload_nightly build_upload_win_nightly |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/build_upload_nightly Mon Feb 27 00:21:38 2017 -0800 +++ b/build_upload_nightly Mon Feb 27 00:28:05 2017 -0800 @@ -9,9 +9,10 @@ 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
--- a/build_upload_win_nightly Mon Feb 27 00:21:38 2017 -0800 +++ b/build_upload_win_nightly Mon Feb 27 00:28:05 2017 -0800 @@ -9,6 +9,12 @@ 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