diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2248f5b8..f5b074d4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -118,8 +118,8 @@ jobs: sleep 5s php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0 php occ app_ecosystem_v2:app:register nc_py_api manual_install --json-info \ - "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \ - -e --force-scopes + "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \ + -e --force-scopes kill -15 $(cat /tmp/_install.pid) timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null diff --git a/lib/DeployActions/ManualActions.php b/lib/DeployActions/ManualActions.php index 54a45ac3..ab52c440 100644 --- a/lib/DeployActions/ManualActions.php +++ b/lib/DeployActions/ManualActions.php @@ -57,6 +57,7 @@ public function loadExAppInfo(string $appId, DaemonConfig $daemonConfig, array $ 'port' => $jsonInfo['port'], 'host' => $jsonInfo['host'], 'secret' => $jsonInfo['secret'], + 'system_app' => $jsonInfo['system_app'], ]; }