From dc38d87beb1131383babc9b06971f5b57e016d14 Mon Sep 17 00:00:00 2001 From: Condorra Date: Sat, 18 Feb 2023 00:34:30 +1100 Subject: [PATCH] Fix bug in deploy script causing missed deploy. --- .ci/deploy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/deploy b/.ci/deploy index 7a1ffca..31ba53f 100755 --- a/.ci/deploy +++ b/.ci/deploy @@ -18,7 +18,7 @@ tar -cvJf binary-archive-$BUILDSTAMP.tar.xz -C binaries blastmud_game blastmud_l scp -i deploy-key binary-archive-$BUILDSTAMP.tar.xz blast@$DEPLOY_HOST:/home/blast/archive/ ssh -i deploy-key blast@$DEPLOY_HOST "find /home/blast/archive -mtime +30 -delete && mkdir -p /home/blast/latest && tar -xvJf /home/blast/archive/binary-archive-$BUILDSTAMP.tar.xz -C /home/blast/latest" -(curl --max-time 10 https://blastmud.org/version || true) >version +(curl --max-time 10 https://ws.blastmud.org/version || true) >version cd blastmud-repo ROOT_COMMIT=$(git rev-list HEAD | tail -n 1) cd .. @@ -28,7 +28,7 @@ GAMESERVER_VERSION=$(jq -r .gameserver_version version || echo ROOT_COMMIT) cd blastmud-repo CURRENT_VERSION=$(git rev-parse HEAD) LISTENER_CHANGES=$(git diff $LISTENER_VERSION $CURRENT_VERSION -- blastmud_listener blastmud_interfaces | wc -l) -GAMESERVER_CHANGES=$(git diff $LISTENER_VERSION $CURRENT_VERSION -- blastmud_gameserver blastmud_interfaces | wc -l) +GAMESERVER_CHANGES=$(git diff $GAMESERVER_VERSION $CURRENT_VERSION -- blastmud_game blastmud_interfaces | wc -l) cd .. echo Listener changes: $LISTENER_CHANGES Gameserver changes: $GAMESERVER_CHANGES