diff --git a/.gitea/workflows/browser-e2e.yml b/.gitea/workflows/browser-e2e.yml index b0c6b2b..9814948 100644 --- a/.gitea/workflows/browser-e2e.yml +++ b/.gitea/workflows/browser-e2e.yml @@ -47,9 +47,9 @@ jobs: echo "Expected short version: $SHORT_VERSION" for i in $(seq 1 30); do # Suppress stderr and allow failures to handle transition/down periods cleanly - VERSION_BODY="$(curl -fsS "http://${DEPLOY_HOST}/taxbaik/version.txt" 2>/dev/null || true)" + VERSION_BODY="$(curl -fsS "http://${DEPLOY_HOST}/taxbaik/version.json" 2>/dev/null || true)" BLOG_STATUS="$(curl -s -o /dev/null -w '%{http_code}' "http://${DEPLOY_HOST}/taxbaik/blog/accountant-mistakes-5" || true)" - if echo "$VERSION_BODY" | grep -q "Version: ${SHORT_VERSION}" && [ "$BLOG_STATUS" = "200" ]; then + if echo "$VERSION_BODY" | grep -q "\"version\": \"${SHORT_VERSION}\"" && [ "$BLOG_STATUS" = "200" ]; then echo "Deployment is ready for ${SHORT_VERSION}" exit 0 fi diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 52fa3a9..ef14a96 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -63,7 +63,7 @@ jobs: COMMIT_HASH=$(git rev-parse --short HEAD) BUILD_TIME=$(date -u +'%Y-%m-%d %H:%M:%S UTC') mkdir -p ./publish/wwwroot - printf 'Version: %s\nBuilt: %s\n' "$COMMIT_HASH" "$BUILD_TIME" > ./publish/wwwroot/version.txt + printf '{\n "version": "%s",\n "built": "%s"\n}\n' "$COMMIT_HASH" "$BUILD_TIME" > ./publish/wwwroot/version.json echo "✓ Build: $COMMIT_HASH @ $BUILD_TIME" - name: Setup SSH