@pnp/cli-microsoft365 11.7.0-beta.293104a → 11.7.0-beta.71c58f3

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -13,6 +13,8 @@ import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { workflow } from './DeployWorkflow.js';
 import { BaseProjectCommand } from './base-project-command.js';
+import { versions } from '../SpfxCompatibilityMatrix.js';
+import { spfx } from '../../../../utils/spfx.js';
 class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_GITHUB_WORKFLOW_ADD;
@@ -43,7 +45,7 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             this.saveWorkflow(workflow);
         }
         catch (error) {
-            throw new CommandError(error);
+            this.handleError(error);
         }
     }
     saveWorkflow(workflow) {
@@ -59,6 +61,16 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         if (options.branchName) {
             workflow.on.push.branches[0] = options.branchName;
         }
+        const version = this.getProjectVersion();
+        if (!version) {
+            throw 'Unable to determine the version of the current SharePoint Framework project. Could not find the correct version based on the version property in the .yo-rc.json file.';
+        }
+        const versionRequirements = versions[version];
+        if (!versionRequirements) {
+            throw `Could not find Node version for version '${version}' of SharePoint Framework.`;
+        }
+        const nodeVersion = spfx.getHighestNodeVersion(versionRequirements.node.range);
+        this.assignNodeVersion(workflow, nodeVersion);
         if (options.manuallyTrigger) {
             // eslint-disable-next-line camelcase
             workflow.on.workflow_dispatch = null;
@@ -83,6 +95,9 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ solutionName }}', solutionName);
         }
     }
+    assignNodeVersion(workflow, nodeVersion) {
+        workflow.jobs['build-and-deploy'].env.NodeVersion = nodeVersion;
+    }
     getLoginAction(workflow) {
         const steps = this.getWorkFlowSteps(workflow);
         return steps.find(step => step.uses && step.uses.indexOf('action-cli-login') >= 0);