From 7ab845595d3cb88efbaeeca55200cd968306153e Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sun, 7 Apr 2019 23:17:18 -0700 Subject: Get OS param from config file for win nightly build/upload script --- build_upload_win_nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_upload_win_nightly') diff --git a/build_upload_win_nightly b/build_upload_win_nightly index b054b3b..1ba8705 100755 --- a/build_upload_win_nightly +++ b/build_upload_win_nightly @@ -7,7 +7,7 @@ hg pull hg up 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 +export OS ./build_release > /tmp/build_${name}_out.log result=$? if [ $result -ne 0 ]; then -- cgit v1.2.3 From e8927ba2b9e93e40fcbb9f4e01e142698f12c73d Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Tue, 9 Apr 2019 00:19:53 -0700 Subject: Use separate directories for Win32 and Win64 nightly builds --- build_upload_win_nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_upload_win_nightly') diff --git a/build_upload_win_nightly b/build_upload_win_nightly index 1ba8705..857f8d6 100755 --- a/build_upload_win_nightly +++ b/build_upload_win_nightly @@ -1,7 +1,7 @@ #!/bin/sh name=$1 . "$HOME/$name.params" -cd $HOME/blastem_win +cd $HOME/$DIR hg revert -a hg pull hg up -- cgit v1.2.3 From f56f65652e292022c1a0fadb3807a7792468f267 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Tue, 9 Apr 2019 22:48:06 -0700 Subject: Fix upload path to take into account separate Win64 directory --- build_upload_win_nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_upload_win_nightly') diff --git a/build_upload_win_nightly b/build_upload_win_nightly index 857f8d6..4aa8c4a 100755 --- a/build_upload_win_nightly +++ b/build_upload_win_nightly @@ -31,7 +31,7 @@ fi . $HOME/remote.params artifact=$(tail -n 1 /tmp/build_${name}_out.log) echo "Uploaing $artifact to $REMOTE_HOST" -scp -i "$REMOTE_IDENT" "$HOME/blastem_win/$artifact" $REMOTE_USER@$REMOTE_HOST:/home/$REMOTE_USER/nightlies +scp -i "$REMOTE_IDENT" "$HOME/$DIR/$artifact" $REMOTE_USER@$REMOTE_HOST:/home/$REMOTE_USER/nightlies curdate=`date -Iseconds` version=`echo "$artifact" | sed -E 's/[^-]+-([0-9]+\.[0-9]+\.[0-9]+[^.]*)\..*$/\1/'` curl -d'@-' -H 'Content-Type: application/json' "$WEBHOOKURL" <