magdev
813b064cc1
Stages a fake AppImage layout in /tmp without a real .AppImage build:
$ROOT/usr/bin/<app> — copy of the host binary
$ROOT/usr/bin/frankenphp — symlink to system frankenphp
$ROOT/usr/share/<app>/symfony — staged --no-dev composer copy
$ROOT/usr/share/<app>/Caddyfile
The staged Symfony tree is `chmod -R a-w` to actually exercise the
read-only-mount cache/log redirect (Kernel::getCacheDir +
APP_CACHE_DIR override) — without the override, Symfony would fail
to mkdir var/cache/prod and migrations would error out.
Then runs the host with BRIDGE_URL unset (forces bundled mode), polls
/healthz, and asserts:
- status=ok + bundle="PhpQml\Bridge\Publisher" — proves the
HealthController deep-load (predecessor commit) actually
autowired Publisher, i.e. BridgeBundle is reachable.
- User data dir's var/cache exists — APP_CACHE_DIR override fired.
- Staged tree's var/cache/prod is empty — Symfony didn't write into
the read-only mount.
Together this catches every v0.1.0 shakedown bug in CI:
- doubled bin/frankenphp path (resolveFrankenphpBin)
- composer path-repo symlink dangling (staging-symfony's symlink:false sed)
- read-only mount cache failure (Kernel + supervisor env-vars)
- bundle autoload broken (HealthController canary)
Implementation gotcha (caught during dev): the host binary must be
COPIED into the staged layout, not symlinked. Qt's
applicationDirPath() reads /proc/self/exe which dereferences
symlinks, so a symlinked host would resolve to the original build/
dir and the supervisor would hunt for frankenphp + symfony there
instead of the staged tree. Real AppImages copy the binary, mimicking
that here.
Wiring:
- examples/todo/Makefile: extracted the staging-symfony logic out
of the appimage target into its own staging-symfony target. New
integration-bundled target depends on `build` + `staging-symfony`
and runs tests/bundled-supervisor.sh. quality target now invokes
integration-bundled after the existing dev-mode integration test.
- .gitea/workflows/ci.yml: new "Bundled-mode supervisor integration
test" step right after the dev-mode integration step.
Closes the v0.1.1 follow-up "Bundled-mode integration test" tracked
in PLAN.md §13.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
91 lines
3.3 KiB
Makefile
91 lines
3.3 KiB
Makefile
# php-qml — Todo example app — Make targets.
|
|
|
|
.DEFAULT_GOAL := help
|
|
|
|
SYMFONY_DIR := symfony
|
|
QML_SRC_DIR := qml
|
|
BUILD_DIR := build/qml
|
|
QT_BIN := $(BUILD_DIR)/todo
|
|
|
|
.PHONY: help
|
|
help: ## Show available targets
|
|
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf " %-12s %s\n", $$1, $$2}' $(MAKEFILE_LIST)
|
|
|
|
.PHONY: install
|
|
install: ## Install Composer dependencies for the Symfony app
|
|
cd $(SYMFONY_DIR) && composer install
|
|
|
|
.PHONY: build
|
|
build: ## Build the Qt host
|
|
cmake -S $(QML_SRC_DIR) -B $(BUILD_DIR) -DCMAKE_BUILD_TYPE=Debug
|
|
cmake --build $(BUILD_DIR) --parallel
|
|
|
|
.PHONY: dev
|
|
dev: build ## Run the todo app in dev mode (FrankenPHP --watch + Qt host)
|
|
./scripts/dev.sh
|
|
|
|
.PHONY: doctor
|
|
doctor: ## Run bridge:doctor inside the Symfony app
|
|
cd $(SYMFONY_DIR) && bin/console bridge:doctor
|
|
|
|
.PHONY: doctor-connect
|
|
doctor-connect: ## Run bridge:doctor with backend connectivity probe
|
|
cd $(SYMFONY_DIR) && bin/console bridge:doctor --connect
|
|
|
|
.PHONY: clean
|
|
clean: ## Remove build artefacts
|
|
rm -rf $(BUILD_DIR)
|
|
|
|
.PHONY: integration
|
|
integration: ## Run the bridge-integration test (FrankenPHP boot + HTTP/SSE round-trip + crash-recover)
|
|
./tests/integration.sh
|
|
|
|
.PHONY: integration-bundled
|
|
integration-bundled: build staging-symfony ## Bundled-mode integration test (faked AppImage layout, no .AppImage build needed)
|
|
./tests/bundled-supervisor.sh
|
|
|
|
.PHONY: perf
|
|
perf: ## Run the AppImage perf smoke test (PLAN.md §11 budgets)
|
|
./tests/perfsmoke.sh build/Todo-x86_64.AppImage
|
|
|
|
.PHONY: staging-symfony
|
|
staging-symfony: ## Stage a --no-dev composer copy of symfony for AppImage / bundled-mode tests
|
|
# Composer install --no-dev in a staging copy of symfony so the
|
|
# dev tree (with maker-bundle etc.) is left untouched.
|
|
rm -rf build/staging-symfony
|
|
rsync -a --delete \
|
|
--exclude='vendor/' \
|
|
--exclude='var/cache/' --exclude='var/log/' \
|
|
$(SYMFONY_DIR)/ build/staging-symfony/
|
|
# Rewrite the path repo to absolute so composer can find the bundle
|
|
# from the staging dir, AND flip symlink:true → false so composer copies
|
|
# the bundle into vendor/ — symlinks would survive the rsync into the
|
|
# AppDir but their targets wouldn't exist on the user's machine.
|
|
BUNDLE_ABS="$$(cd $(SYMFONY_DIR)/../../../framework/php && pwd)"; \
|
|
sed -i "s|\"../../../framework/php\"|\"$$BUNDLE_ABS\"|" build/staging-symfony/composer.json
|
|
sed -i 's|"symlink": true|"symlink": false|' build/staging-symfony/composer.json
|
|
rm -f build/staging-symfony/composer.lock
|
|
cd build/staging-symfony && composer install --no-dev --no-interaction --classmap-authoritative
|
|
|
|
.PHONY: appimage
|
|
appimage: build staging-symfony ## Package as a single-file Linux AppImage at build/Todo-x86_64.AppImage
|
|
../../packaging/linux/build-appimage.sh \
|
|
--app-name todo \
|
|
--host-binary $(QT_BIN) \
|
|
--symfony-dir build/staging-symfony \
|
|
--frankenphp $${FRANKENPHP:-frankenphp} \
|
|
--caddyfile Caddyfile \
|
|
--desktop packaging/todo.desktop \
|
|
--icon packaging/todo.png \
|
|
--output build/Todo-x86_64.AppImage \
|
|
$${APPIMAGE_UPDATE_INFO:+--update-info "$$APPIMAGE_UPDATE_INFO"}
|
|
@echo
|
|
@echo "AppImage built. Test with: ./build/Todo-x86_64.AppImage"
|
|
|
|
.PHONY: quality
|
|
quality: build ## Run PHPStan, php-cs-fixer (check), PHPUnit, qmllint, integration (dev + bundled)
|
|
cd ../../framework/php && composer quality
|
|
cmake --build $(BUILD_DIR) --target all_qmllint
|
|
./tests/integration.sh
|
|
$(MAKE) integration-bundled
|