diff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml index af5a0ee..2b3c070 100644 --- a/.github/workflows/fly-deploy.yml +++ b/.github/workflows/fly-deploy.yml @@ -43,7 +43,7 @@ jobs: exit 1 fi - APP_FROM_CONFIG="$(sed -n 's/^app = \"\\(.*\\)\"/\\1/p' fly.toml | head -n1)" + APP_FROM_CONFIG="$(awk -F'\"' '/^app[[:space:]]*=/ { print $2; exit }' fly.toml)" APP_NAME="${APP_FROM_CONFIG:-${FLY_APP_NAME}}" PRIMARY_REGION="${FLY_PRIMARY_REGION:-ord}" VOLUME_NAME="${FLY_VOLUME_NAME:-yappybara_data}" @@ -59,8 +59,8 @@ jobs: echo "Ignoring stale FLY_APP_NAME='${FLY_APP_NAME}' and using fly.toml app '${APP_FROM_CONFIG}'." fi - APP_INFO_OUTPUT="$(flyctl apps info --app "${APP_NAME}" 2>&1 || true)" - if ! echo "${APP_INFO_OUTPUT}" | grep -q "Hostname"; then + APP_INFO_OUTPUT="$(flyctl status --app "${APP_NAME}" 2>&1 || true)" + if ! echo "${APP_INFO_OUTPUT}" | grep -q "App"; then if echo "${APP_INFO_OUTPUT}" | grep -qi "app not found"; then echo "Fly app ${APP_NAME} does not exist yet. Creating it now..." flyctl apps create "${APP_NAME}"