diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0bbc5c1..59a4cb7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -45,6 +45,8 @@ jobs: SERVER_ID: ${{ secrets.SERVER_ID }} TOKEN: ${{ secrets.TOKEN }} UPLOAD_DIR: "../build/libs" + COMMIT_MESSAGE: ${{ github.event.head_commit.message }} + COMMIT_AUTHOR: ${{ github.event.head_commit.author.name }} run: | cd scripts chmod +x ./special_curl diff --git a/scripts/update.sh b/scripts/update.sh index a08417a..a4cf425 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -27,7 +27,10 @@ fi special_curl "$SIGNED_URL&directory=/mods" -X POST -F "files=@$UPLOAD" echo "Uploaded!" -BROADCAST="[ SFCRAFT UPDATE ] Server is shutting down in 10s, please be ready." +BROADCAST="Server is shutting down in 10s, please be ready." +UPDATE_CONTENT="[ SFCRAFT UPDATE ] $COMMIT_MESSAGE by $COMMIT_AUTHOR" +special_curl "$API_ENDPOINT/api/client/servers/$SERVER_ID/command" -H "Content-Type: application/json" -H "Accept: application/json" -H "Authorization: Bearer $TOKEN" -X POST -d "{\"command\":\"say $UPDATE_CONTENT\"}" +sleep 1s special_curl "$API_ENDPOINT/api/client/servers/$SERVER_ID/command" -H "Content-Type: application/json" -H "Accept: application/json" -H "Authorization: Bearer $TOKEN" -X POST -d "{\"command\":\"say $BROADCAST\"}" echo "Broadcast is sent!" sleep 10s