@akash-chowdhury-24/deployhub 2.0.27 → 2.0.28

package/README.md

@@ -651,6 +651,7 @@ All JS frontends share the same install/build flow: `npm ci` → `npm run build`
 
 - **Detect:** `composer.json` with `laravel/framework` or `symfony/framework-bundle`.
 - **Install:** Composer (on CI and server).
+- **CI runtime:** Generated workflows install PHP via `shivammathur/setup-php@v2` with Composer. Default version is **8.4** (meets current Laravel platform requirements). Override with `"phpVersion": "8.3"` at the config root or under `"backend"` in `deployhub.config.json`, then run `deployhub sync-workflows`.
 - **Deploy:** SSH with PHP-FPM or `php artisan` for Laravel.
 
 > ⚠️ **PHP-FPM deployments restart the FPM service for the ENTIRE host on every deploy.** If you run multiple DeployHub-managed environments on the same server, deploying ANY of them will briefly interrupt in-flight requests for ALL of them. For production use with multiple environments, either use separate hosts per environment, or set up per-environment PHP-FPM pools manually (not yet automated by DeployHub).
@@ -695,7 +696,9 @@ git commit -m "Add DeployHub CI"
 2. Add every secret listed at the end of `deployhub init` (storage + deployment).
 3. Push to `main` or `master` — the deploy workflow triggers on push.
 
-The deploy workflow (`deployhub.yml`) installs the correct language runtime (Node, Python, Java, Go, .NET, Ruby) based on your `deployhub.config.json`, installs DeployHub, runs `deployhub build`, and uses your secrets.
+The deploy workflow (`deployhub.yml`) installs the correct language runtime (Node, Python, PHP, Java, Go, .NET, Ruby) based on your `deployhub.config.json`, installs DeployHub, runs `deployhub build`, and uses your secrets. For PHP projects, CI uses `shivammathur/setup-php` (default **8.4**; override with `phpVersion` / `backend.phpVersion`).
+
+When an environment uses Kubernetes, the workflow installs `kubectl` and writes kubeconfig from secrets — but only when that run actually needs cluster access (push with a push-triggered k8s env, or workflow_dispatch / rollback targeting a k8s env, `all`, or blank). Plain pushes that only auto-deploy non-k8s environments (e.g. EC2 development) skip those steps.
 
 To run a deploy manually: **Actions → DeployHub → Run workflow**.
 
@@ -1002,7 +1005,7 @@ DeployHub detects whether the server uses Debian-style `sites-available` or RHEL
 
 **What DeployHub automates:**
 - Starter `k8s/deployment.yaml` and `k8s/service.yaml` when no manifests exist (skipped if you already have a `k8s/` directory or root-level Kubernetes YAML files)
-- GitHub Actions installs `kubectl` on the CI runner and writes kubeconfig from secrets (no local `kubectl` required for the automated push-to-main deploy path)
+- GitHub Actions installs `kubectl` on the CI runner and writes kubeconfig from secrets when the run targets a Kubernetes environment (skipped on push when k8s is manual-only)
 - Lists `kubectl` contexts during `init` for easy selection
 - Auto-detects `~/.kube/config`
 - Complete `.env.example` for kubeconfig, context, namespace, and registry settings

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akash-chowdhury-24/deployhub",
-  "version": "2.0.27",
+  "version": "2.0.28",
   "description": "Zero-configuration deployment and artifact manager",
   "type": "module",
   "main": "./src/cli/index.js",

package/src/core/config.js

@@ -20,6 +20,8 @@ import {
 const SideConfigSchema = z.object({
   framework: z.string(),
   language: z.string().optional(),
+  /** PHP runtime for CI (`shivammathur/setup-php`); e.g. `"8.4"`. */
+  phpVersion: z.string().optional(),
   buildCommand: z.string().nullable().optional(),
   startCommand: z.string().nullable().optional(),
   buildOutput: z.string().optional(),
@@ -81,6 +83,11 @@ const ConfigSchema = z.object({
   projectType: z.enum(['frontend', 'backend', 'both']).default('frontend'),
   framework: z.string().optional(),
   language: z.string().optional(),
+  /**
+   * PHP runtime for generated GitHub Actions (`shivammathur/setup-php`).
+   * Prefer `backend.phpVersion` for backend/both projects. Default when unset: `8.4`.
+   */
+  phpVersion: z.string().optional(),
   buildCommand: z.string().nullable().optional(),
   startCommand: z.string().nullable().optional(),
   buildOutput: z.string().optional(),

package/src/utils/github-actions.js

@@ -18,10 +18,14 @@ import {
 } from '../deployment/deployment-env.js';
 import {
   getEnvMethod,
+  getEnvTrigger,
   getEnabledEnvironmentNames,
   isEnvEnabled,
 } from '../core/environments.js';
 
+/** Default PHP for CI when config does not set `phpVersion` / `backend.phpVersion`. */
+export const DEFAULT_PHP_VERSION = '8.4';
+
 /** @typedef {'aws'|'azure'|'gcp'|'gdrive'|'dropbox'|'local'|'ftp'|'ssh'} ProviderEnvKey */
 
 /** Storage-only providers — never treat deployment method ids as storage. */
@@ -267,6 +271,40 @@ function getGithubGitConfigStep() {
           fi`;
 }
 
+/**
+ * Resolve PHP version for CI setup-php.
+ * Order: `backend.phpVersion` → top-level `phpVersion` → {@link DEFAULT_PHP_VERSION} (`8.4`).
+ * Set either config key in deployhub.config.json to pin a different runtime
+ * (e.g. `"phpVersion": "8.3"` or `"backend": { "phpVersion": "8.3" }`).
+ *
+ * @param {import('../core/config.js').DeployHubConfig} [config]
+ * @returns {string}
+ */
+export function resolvePhpVersion(config) {
+  const fromBackend = config?.backend?.phpVersion;
+  if (typeof fromBackend === 'string' && fromBackend.trim()) {
+    return fromBackend.trim();
+  }
+  const fromRoot = config?.phpVersion;
+  if (typeof fromRoot === 'string' && fromRoot.trim()) {
+    return fromRoot.trim();
+  }
+  return DEFAULT_PHP_VERSION;
+}
+
+/**
+ * @param {import('../core/config.js').DeployHubConfig} [config]
+ * @returns {boolean}
+ */
+function isPhpProject(config) {
+  if (!config) return false;
+  const projectType = config.projectType || 'frontend';
+  if (projectType !== 'backend' && projectType !== 'both') return false;
+  const framework = config.backend?.framework || config.framework || '';
+  const language = config.backend?.language || config.language || '';
+  return language === 'php' || ['laravel', 'symfony', 'php'].includes(framework);
+}
+
 /**
  * @param {import('../core/config.js').DeployHubConfig} [config]
  * @returns {string[]}
@@ -292,6 +330,14 @@ function getBackendSetupSteps(config) {
         with:
           python-version: '3.11'`);
     }
+    if (isPhpProject(config)) {
+      const phpVersion = resolvePhpVersion(config);
+      steps.push(`      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '${phpVersion}'
+          tools: composer`);
+    }
     if (['spring', 'java'].includes(framework)) {
       steps.push(`      - uses: actions/setup-java@v4
         with:
@@ -362,18 +408,69 @@ function resolveKubeconfigWorkflowSecretName(deployEnvironments, environments, c
     : 'KUBECONFIG';
 }
 
+/**
+ * GitHub Actions `if:` so kubectl/kubeconfig only run when this job needs k8s.
+ * - Push: only when at least one push-triggered env uses kubernetes (skip when push
+ *   only deploys EC2/SSH/etc. and k8s is manual-only).
+ * - workflow_dispatch / rollback: when selected env is k8s, `all`, or blank
+ *   (blank = deploy/rollback all enabled envs).
+ * Returns null when every enabled env is kubernetes (steps always needed).
+ *
+ * @param {string[]} deployEnvironments
+ * @param {Record<string, { type?: string, method?: string, trigger?: string }>} environments
+ * @param {'deploy'|'rollback'} [kind]
+ * @returns {string|null}
+ */
+function getKubernetesSetupIfExpression(
+  deployEnvironments,
+  environments,
+  kind = 'deploy'
+) {
+  const k8sNames = deployEnvironments.filter(
+    (n) => getEnvMethod(environments[n]) === 'kubernetes'
+  );
+  if (k8sNames.length === 0) return null;
+
+  const nonK8s = deployEnvironments.filter(
+    (n) => getEnvMethod(environments[n]) !== 'kubernetes'
+  );
+  // All enabled envs are kubernetes — setup is always required.
+  if (nonK8s.length === 0) return null;
+
+  const dispatchNeedK8s = [
+    ...k8sNames.map((n) => `inputs.environment == '${n}'`),
+    `inputs.environment == 'all'`,
+    `inputs.environment == ''`,
+  ].join(' || ');
+
+  if (kind === 'rollback') {
+    return `github.event_name == 'workflow_dispatch' && (${dispatchNeedK8s})`;
+  }
+
+  const pushK8s = k8sNames.filter(
+    (n) => getEnvTrigger(environments[n]) === 'push'
+  );
+  if (pushK8s.length > 0) {
+    return `github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && (${dispatchNeedK8s}))`;
+  }
+  // Manual-only kubernetes: never configure kubeconfig on plain push.
+  return `github.event_name == 'workflow_dispatch' && (${dispatchNeedK8s})`;
+}
+
 /**
  * @param {string} [kubeconfigSecretName]
+ * @param {string|null} [ifExpression]
  * @returns {string}
  */
-function getKubernetesSetupSteps(kubeconfigSecretName = 'KUBECONFIG') {
+function getKubernetesSetupSteps(kubeconfigSecretName = 'KUBECONFIG', ifExpression = null) {
   // One kubeconfig file per job — see resolveKubeconfigWorkflowSecretName LIMITATION.
-  return `      - name: Setup kubectl
+  const ifLine = ifExpression ? `\n        if: ${ifExpression}` : '';
+  return `      - name: Setup kubectl${ifLine}
         uses: azure/setup-kubectl@v4
         with:
           version: '${KUBECTL_VERSION}'
 
-      - name: Configure kubeconfig
+      - name: Configure kubeconfig${ifLine}
         env:
           KUBECONFIG_SECRET: \${{ secrets.${kubeconfigSecretName} }}
         run: |
@@ -580,8 +677,13 @@ export function generateWorkflowYaml(
     environments,
     config
   );
+  const k8sIf = getKubernetesSetupIfExpression(
+    allDeployNames,
+    environments,
+    'deploy'
+  );
   const kubernetesSteps = hasKubernetesDeploy(allDeployNames, environments)
-    ? `${getKubernetesSetupSteps(kubeconfigSecret)}\n`
+    ? `${getKubernetesSetupSteps(kubeconfigSecret, k8sIf)}\n`
     : '';
 
   const projectType = config?.projectType || 'frontend';
@@ -688,6 +790,13 @@ export function generateRollbackWorkflowYaml(
   const envBlock = formatWorkflowEnvBlock(envVars);
 
   const installSpec = getCliInstallSpec(cliSource);
+  // Rollback does not generally install project deps; PHP is the exception
+  // (composer install) so we only inject setup-php here — not other backends.
+  const phpSetupSteps = isPhpProject(config)
+    ? [...new Set(getBackendSetupSteps(config))]
+        .filter((s) => s.includes('setup-php'))
+        .join('\n')
+    : '';
   const githubGitConfigStep = isGithubCliSource(cliSource)
     ? `${getGithubGitConfigStep()}\n`
     : '';
@@ -696,14 +805,25 @@ export function generateRollbackWorkflowYaml(
     environments,
     config
   );
+  const k8sIf = getKubernetesSetupIfExpression(
+    allDeployNames,
+    environments,
+    'rollback'
+  );
   const kubernetesSteps = hasKubernetesDeploy(allDeployNames, environments)
-    ? `${getKubernetesSetupSteps(kubeconfigSecret)}\n`
+    ? `${getKubernetesSetupSteps(kubeconfigSecret, k8sIf)}\n`
     : '';
 
   const rollbackCmd = getCliRollbackCommand();
   const envChoiceOptions = formatEnvironmentChoiceOptions(environments);
   const hasEnvs = envNames.length > 0;
 
+  const phpInstallStep = isPhpProject(config)
+    ? `      - name: Install project dependencies
+        run: ${getInstallDepsCommand(config)}
+`
+    : '';
+
   const environmentInput = hasEnvs
     ? `      environment:
         description: 'Environment to roll back (or "all")'
@@ -747,10 +867,10 @@ ${environmentInput}jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+${phpSetupSteps ? `${phpSetupSteps}\n` : ''}      - uses: actions/setup-node@v4
         with:
           node-version: '20'
-${kubernetesSteps}${githubGitConfigStep}      - name: Install DeployHub CLI
+${kubernetesSteps}${githubGitConfigStep}${phpInstallStep}      - name: Install DeployHub CLI
         run: npm install ${installSpec} --no-save
       - name: Rollback
         env:
@@ -774,7 +894,7 @@ function getInstallDepsCommand(config) {
   if (language === 'python' || ['fastapi', 'django', 'flask', 'python'].includes(framework)) {
     return 'pip install -r requirements.txt';
   }
-  if (['laravel', 'symfony', 'php'].includes(framework)) {
+  if (language === 'php' || ['laravel', 'symfony', 'php'].includes(framework)) {
     return 'composer install --no-interaction';
   }
   if (framework === 'spring' || framework === 'java') {