From 61305627e33ce22d574e461aaeaded11f33eca26 Mon Sep 17 00:00:00 2001 From: Condorra Date: Mon, 13 Feb 2023 22:37:45 +1100 Subject: [PATCH] More deploy fixups. --- .ci/deploy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/deploy b/.ci/deploy index 898beb71..7a1ffca6 100755 --- a/.ci/deploy +++ b/.ci/deploy @@ -18,15 +18,15 @@ 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://blastmud.org/version || true) >version cd blastmud-repo ROOT_COMMIT=$(git rev-list HEAD | tail -n 1) cd .. LISTENER_VERSION=$(jq -r .listener_version version || echo ROOT_COMMIT) GAMESERVER_VERSION=$(jq -r .gameserver_version version || echo ROOT_COMMIT) -CURRENT_VERSION=$(git rev-parse HEAD) 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) cd ..