Remove duplicate test file and fix expression bypass

- Remove duplicate test file (errors-job-environment-deployment-disabled-feature.yml)
- Move deployment feature flag check before expression skip so
  deployment: ${{ ... }} is still gated by allowDeploymentKeyword

expressions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/expressions",
-  "version": "0.3.49",
+  "version": "0.3.47",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",

expressions/src/features.test.ts

@@ -55,7 +55,9 @@ describe("FeatureFlags", () => {
         "missingInputsQuickfix",
         "blockScalarChompingWarning",
         "allowCaseFunction",
-        "allowCopilotRequestsPermission"
+        "allowCronTimezone",
+        "allowCopilotRequestsPermission",
+        "allowDeploymentKeyword"
       ]);
     });
   });

expressions/src/features.ts

@@ -35,11 +35,23 @@ export interface ExperimentalFeatures {
    */
   allowCaseFunction?: boolean;
 
+  /**
+   * Enable the timezone input in cron schedule mappings.
+   * @default false
+   */
+  allowCronTimezone?: boolean;
+
   /**
    * Enable the copilot-requests permission in workflow permissions.
    * @default false
    */
   allowCopilotRequestsPermission?: boolean;
+
+  /**
+   * Enable the deployment keyword in workflow job environment.
+   * @default false
+   */
+  allowDeploymentKeyword?: boolean;
 }
 
 /**
@@ -55,7 +67,9 @@ const allFeatureKeys: ExperimentalFeatureKey[] = [
   "missingInputsQuickfix",
   "blockScalarChompingWarning",
   "allowCaseFunction",
-  "allowCopilotRequestsPermission"
+  "allowCronTimezone",
+  "allowCopilotRequestsPermission",
+  "allowDeploymentKeyword"
 ];
 
 export class FeatureFlags {

languageserver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/languageserver",
-  "version": "0.3.49",
+  "version": "0.3.47",
   "description": "Language server for GitHub Actions",
   "license": "MIT",
   "type": "module",
@@ -48,8 +48,8 @@
     "actions-languageserver": "./bin/actions-languageserver"
   },
   "dependencies": {
-    "@actions/languageservice": "^0.3.49",
-    "@actions/workflow-parser": "^0.3.49",
+    "@actions/languageservice": "^0.3.47",
+    "@actions/workflow-parser": "^0.3.47",
     "@octokit/rest": "^21.1.1",
     "@octokit/types": "^9.0.0",
     "vscode-languageserver": "^8.0.2",

languageservice/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/languageservice",
-  "version": "0.3.49",
+  "version": "0.3.47",
   "description": "Language service for GitHub Actions",
   "license": "MIT",
   "type": "module",
@@ -47,8 +47,8 @@
     "watch": "tsc --build tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@actions/expressions": "^0.3.49",
-    "@actions/workflow-parser": "^0.3.49",
+    "@actions/expressions": "^0.3.47",
+    "@actions/workflow-parser": "^0.3.47",
     "vscode-languageserver-textdocument": "^1.0.7",
     "vscode-languageserver-types": "^3.17.2",
     "vscode-uri": "^3.0.8",

languageservice/src/complete.test.ts

@@ -927,7 +927,35 @@ jobs:
 });
 
 describe("schedule timezone completion", () => {
-  it("includes timezone for schedule", async () => {
+  it("includes timezone when allowCronTimezone is enabled", async () => {
+    const input = `on:
+  schedule:
+    - |`;
+    const result = await complete(...getPositionFromCursor(input), {
+      featureFlags: new FeatureFlags({allowCronTimezone: true})
+    });
+
+    expect(result).not.toBeUndefined();
+    const labels = result.map(x => x.label);
+    expect(labels).toContain("cron");
+    expect(labels).toContain("timezone");
+  });
+
+  it("excludes timezone when allowCronTimezone is disabled", async () => {
+    const input = `on:
+  schedule:
+    - |`;
+    const result = await complete(...getPositionFromCursor(input), {
+      featureFlags: new FeatureFlags({allowCronTimezone: false})
+    });
+
+    expect(result).not.toBeUndefined();
+    const labels = result.map(x => x.label);
+    expect(labels).toContain("cron");
+    expect(labels).not.toContain("timezone");
+  });
+
+  it("excludes timezone when no feature flags are provided", async () => {
     const input = `on:
   schedule:
     - |`;
@@ -936,7 +964,7 @@ describe("schedule timezone completion", () => {
     expect(result).not.toBeUndefined();
     const labels = result.map(x => x.label);
     expect(labels).toContain("cron");
-    expect(labels).toContain("timezone");
+    expect(labels).not.toContain("timezone");
   });
 });
 

languageservice/src/complete.ts

@@ -163,6 +163,11 @@ export async function complete(
     values = filterActionRunsCompletions(values, path, parsedTemplate.value);
   }
 
+  // Filter `timezone` from schedule completions when the feature flag is disabled
+  if (!config?.featureFlags?.isEnabled("allowCronTimezone") && parent?.definition?.key === "schedule") {
+    values = values.filter(v => v.label !== "timezone");
+  }
+
   // Filter `copilot-requests` from permissions completions when the feature flag is disabled
   if (
     !config?.featureFlags?.isEnabled("allowCopilotRequestsPermission") &&

languageservice/src/validate.test.ts

@@ -368,24 +368,6 @@ jobs:
     });
   });
 
-  describe("environment deployment", () => {
-    it("allows deployment boolean under environment mapping", async () => {
-      const workflow = `
-on: push
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    environment:
-      name: prod
-      deployment: false
-    steps:
-    - run: echo
-`;
-      const result = await validate(createDocument("wf.yaml", workflow));
-      expect(result).toEqual([]);
-    });
-  });
-
   describe("workflow_dispatch", () => {
     it("allows empty string in choice options", async () => {
       const result = await validate(

languageservice/src/validate.ts

@@ -84,7 +84,8 @@ async function validateWorkflow(textDocument: TextDocument, config?: ValidationC
       // Errors will be updated in the context. Attempt to do the conversion anyway in order to give the user more information
       const template = await getOrConvertWorkflowTemplate(result.context, result.value, textDocument.uri, config, {
         fetchReusableWorkflowDepth: config?.fileProvider ? 1 : 0,
-        errorPolicy: ErrorPolicy.TryConversion
+        errorPolicy: ErrorPolicy.TryConversion,
+        featureFlags: config?.featureFlags
       });
 
       // Validate expressions and value providers

lerna.json

@@ -6,5 +6,5 @@
     "languageservice",
     "languageserver"
   ],
-  "version": "0.3.49"
+  "version": "0.3.47"
 }

package-lock.json

@@ -136,7 +136,7 @@
     },
     "expressions": {
       "name": "@actions/expressions",
-      "version": "0.3.49",
+      "version": "0.3.47",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.0.3",
@@ -396,11 +396,11 @@
     },
     "languageserver": {
       "name": "@actions/languageserver",
-      "version": "0.3.49",
+      "version": "0.3.47",
       "license": "MIT",
       "dependencies": {
-        "@actions/languageservice": "^0.3.49",
-        "@actions/workflow-parser": "^0.3.49",
+        "@actions/languageservice": "^0.3.47",
+        "@actions/workflow-parser": "^0.3.47",
         "@octokit/rest": "^21.1.1",
         "@octokit/types": "^9.0.0",
         "vscode-languageserver": "^8.0.2",
@@ -927,11 +927,11 @@
     },
     "languageservice": {
       "name": "@actions/languageservice",
-      "version": "0.3.49",
+      "version": "0.3.47",
       "license": "MIT",
       "dependencies": {
-        "@actions/expressions": "^0.3.49",
-        "@actions/workflow-parser": "^0.3.49",
+        "@actions/expressions": "^0.3.47",
+        "@actions/workflow-parser": "^0.3.47",
         "vscode-languageserver-textdocument": "^1.0.7",
         "vscode-languageserver-types": "^3.17.2",
         "vscode-uri": "^3.0.8",
@@ -14020,10 +14020,10 @@
     },
     "workflow-parser": {
       "name": "@actions/workflow-parser",
-      "version": "0.3.49",
+      "version": "0.3.47",
       "license": "MIT",
       "dependencies": {
-        "@actions/expressions": "^0.3.49",
+        "@actions/expressions": "^0.3.47",
         "cronstrue": "^2.21.0",
         "yaml": "^2.0.0-8"
       },

workflow-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/workflow-parser",
-  "version": "0.3.49",
+  "version": "0.3.47",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -48,7 +48,7 @@
     "watch": "tsc --build tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@actions/expressions": "^0.3.49",
+    "@actions/expressions": "^0.3.47",
     "cronstrue": "^2.21.0",
     "yaml": "^2.0.0-8"
   },

workflow-parser/src/model/convert.test.ts

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
+import {FeatureFlags} from "@actions/expressions/features";
 import {nullTrace} from "../test-utils/null-trace.js";
 import {parseWorkflow} from "../workflows/workflow-parser.js";
 import {convertWorkflowTemplate, ErrorPolicy} from "./convert.js";
@@ -579,8 +580,8 @@ jobs:
     });
   });
 
-  describe("schedule timezone", () => {
-    it("allows timezone in schedule", async () => {
+  describe("schedule timezone with feature flags", () => {
+    it("allows timezone when allowCronTimezone is enabled", async () => {
       const result = parseWorkflow(
         {
           name: "wf.yaml",
@@ -596,7 +597,8 @@ jobs:
       );
 
       const template = await convertWorkflowTemplate(result.context, result.value!, undefined, {
-        errorPolicy: ErrorPolicy.TryConversion
+        errorPolicy: ErrorPolicy.TryConversion,
+        featureFlags: new FeatureFlags({allowCronTimezone: true})
       });
 
       expect(result.context.errors.getErrors()).toHaveLength(0);
@@ -607,6 +609,57 @@ jobs:
       });
     });
 
+    it("reports error when timezone is present but allowCronTimezone is disabled", async () => {
+      const result = parseWorkflow(
+        {
+          name: "wf.yaml",
+          content: `on:
+  schedule:
+    - cron: '0 0 * * *'
+      timezone: America/New_York
+jobs:
+  build:
+    runs-on: ubuntu-latest`
+        },
+        nullTrace
+      );
+
+      const template = await convertWorkflowTemplate(result.context, result.value!, undefined, {
+        errorPolicy: ErrorPolicy.TryConversion,
+        featureFlags: new FeatureFlags({allowCronTimezone: false})
+      });
+
+      // When timezone feature is disabled, error points at the timezone key
+      expect(result.context.errors.getErrors()).toHaveLength(1);
+      expect(result.context.errors.getErrors()[0].message).toContain("Key 'timezone' is not supported");
+      // Schedule entry is dropped due to unsupported key
+      expect(template.events?.schedule).toHaveLength(0);
+    });
+
+    it("reports error when timezone is present with no feature flags provided", async () => {
+      const result = parseWorkflow(
+        {
+          name: "wf.yaml",
+          content: `on:
+  schedule:
+    - cron: '0 0 * * *'
+      timezone: America/New_York
+jobs:
+  build:
+    runs-on: ubuntu-latest`
+        },
+        nullTrace
+      );
+
+      await convertWorkflowTemplate(result.context, result.value!, undefined, {
+        errorPolicy: ErrorPolicy.TryConversion
+      });
+
+      // Default is timezone disabled, so error points at the timezone key
+      expect(result.context.errors.getErrors()).toHaveLength(1);
+      expect(result.context.errors.getErrors()[0].message).toContain("Key 'timezone' is not supported");
+    });
+
     it("reports error when cron is missing from schedule entry", async () => {
       const result = parseWorkflow(
         {
@@ -622,7 +675,8 @@ jobs:
       );
 
       const template = await convertWorkflowTemplate(result.context, result.value!, undefined, {
-        errorPolicy: ErrorPolicy.TryConversion
+        errorPolicy: ErrorPolicy.TryConversion,
+        featureFlags: new FeatureFlags({allowCronTimezone: true})
       });
 
       // Both schema validation and converter report the missing cron
@@ -635,7 +689,7 @@ jobs:
       expect(template.events?.schedule).toHaveLength(0);
     });
 
-    it("converts schedule without timezone", async () => {
+    it("converts schedule without timezone when allowCronTimezone is enabled", async () => {
       const result = parseWorkflow(
         {
           name: "wf.yaml",
@@ -650,7 +704,8 @@ jobs:
       );
 
       const template = await convertWorkflowTemplate(result.context, result.value!, undefined, {
-        errorPolicy: ErrorPolicy.TryConversion
+        errorPolicy: ErrorPolicy.TryConversion,
+        featureFlags: new FeatureFlags({allowCronTimezone: true})
       });
 
       expect(result.context.errors.getErrors()).toHaveLength(0);

workflow-parser/src/model/convert.ts

@@ -40,8 +40,7 @@ export type WorkflowTemplateConverterOptions = {
   errorPolicy?: ErrorPolicy;
 
   /**
-   * Feature flags for experimental features.
-   * This option is not currently used but keeping it for future use.
+   * Optional feature flags to control which experimental features are enabled.
    */
   featureFlags?: FeatureFlags;
 };
@@ -62,6 +61,11 @@ export async function convertWorkflowTemplate(
   const result = {} as WorkflowTemplate;
   const opts = getOptionsWithDefaults(options);
 
+  // Store feature flags in context state so converters can access them
+  if (opts.featureFlags) {
+    context.state["featureFlags"] = opts.featureFlags;
+  }
+
   if (context.errors.getErrors().length > 0 && opts.errorPolicy === ErrorPolicy.ReturnErrorsOnly) {
     result.errors = context.errors.getErrors().map(x => ({
       Message: x.message

workflow-parser/src/model/converter/events.ts

@@ -1,3 +1,4 @@
+import {FeatureFlags} from "@actions/expressions/features";
 import {TemplateContext} from "../../templates/template-context.js";
 import {MappingToken} from "../../templates/tokens/mapping-token.js";
 import {SequenceToken} from "../../templates/tokens/sequence-token.js";
@@ -55,7 +56,8 @@ export function convertOn(context: TemplateContext, token: TemplateToken): Event
       // Schedule is the only event that can be a sequence, handle that separately
       if (eventName === "schedule") {
         const scheduleToken = item.value.assertSequence(`event ${eventName}`);
-        result.schedule = convertSchedule(context, scheduleToken);
+        const featureFlags = context.state["featureFlags"] as FeatureFlags | undefined;
+        result.schedule = convertSchedule(context, scheduleToken, featureFlags);
         continue;
       }
 
@@ -147,7 +149,13 @@ function convertFilter<T extends TypesFilterConfig & WorkflowFilterConfig & Vers
   return result;
 }
 
-function convertSchedule(context: TemplateContext, token: SequenceToken): ScheduleConfig[] | undefined {
+function convertSchedule(
+  context: TemplateContext,
+  token: SequenceToken,
+  featureFlags?: FeatureFlags
+): ScheduleConfig[] | undefined {
+  const flags = featureFlags ?? new FeatureFlags();
+  const allowTimezone = flags.isEnabled("allowCronTimezone");
   const result = [] as ScheduleConfig[];
 
   for (const item of token) {
@@ -165,8 +173,13 @@ function convertSchedule(context: TemplateContext, token: SequenceToken): Schedu
         }
         config.cron = cron.value;
       } else if (key.value === "timezone") {
-        const timezone = entry.value.assertString(`schedule timezone`);
-        config.timezone = timezone.value;
+        if (allowTimezone) {
+          const timezone = entry.value.assertString(`schedule timezone`);
+          config.timezone = timezone.value;
+        } else {
+          context.error(key, `Key 'timezone' is not supported`);
+          valid = false;
+        }
       } else {
         context.error(key, `Invalid schedule key`);
         valid = false;

workflow-parser/src/model/converter/job/environment.ts

@@ -1,3 +1,4 @@
+import {FeatureFlags} from "@actions/expressions/features";
 import {TemplateContext} from "../../../templates/template-context.js";
 import {TemplateToken} from "../../../templates/tokens/template-token.js";
 import {isScalar} from "../../../templates/tokens/type-guards.js";
@@ -22,6 +23,18 @@ export function convertToActionsEnvironmentRef(
 
   for (const property of environmentMapping) {
     const propertyName = property.key.assertString("job environment key");
+
+    // Check deployment feature flag before skipping expressions,
+    // so deployment: ${{ ... }} is still gated by the flag
+    if (propertyName.value === "deployment") {
+      const featureFlags = context.state["featureFlags"] as FeatureFlags | undefined;
+      const flags = featureFlags ?? new FeatureFlags();
+      if (!flags.isEnabled("allowDeploymentKeyword")) {
+        context.error(property.key, `The key 'deployment' is not allowed`);
+        continue;
+      }
+    }
+
     if (property.key.isExpression || property.value.isExpression) {
       continue;
     }
@@ -35,13 +48,9 @@ export function convertToActionsEnvironmentRef(
         result.url = property.value;
         break;
 
-      case "deployment": {
-        const deploymentValue = property.value.assertBoolean("job environment deployment");
-        if (deploymentValue.value === false) {
-          result.skipDeployment = true;
-        }
+      case "deployment":
+        result.deployment = property.value;
         break;
-      }
     }
   }
 

workflow-parser/src/model/workflow-template.ts

@@ -26,7 +26,7 @@ export type ConcurrencySetting = {
 export type ActionsEnvironmentReference = {
   name?: TemplateToken;
   url?: TemplateToken;
-  skipDeployment?: boolean;
+  deployment?: TemplateToken;
 };
 
 export type WorkflowJob = Job | ReusableWorkflowJob;

workflow-parser/src/workflow-v1.0.json

@@ -2082,7 +2082,7 @@
           },
           "deployment": {
             "type": "boolean",
-            "description": "Whether to create a deployment record for this environment. Defaults to true."
+            "description": "Whether to create a deployment for this environment. Set to `false` to access environment secrets and variables without creating a deployment record. Defaults to `true`."
           }
         }
       }

workflow-parser/src/xlang.test.ts

@@ -1,6 +1,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import * as YAML from "yaml";
+import {FeatureFlags} from "@actions/expressions/features";
 import {convertWorkflowTemplate} from "./model/convert.js";
 import {NoOperationTraceWriter} from "./templates/trace-writer.js";
 import {File} from "./workflows/file.js";
@@ -10,6 +11,7 @@ import {parseWorkflow} from "./workflows/workflow-parser.js";
 
 interface TestOptions {
   "include-source"?: boolean;
+  "allow-deployment-keyword"?: boolean;
   skip?: string[];
 }
 
@@ -85,7 +87,10 @@ describe("x-lang tests", () => {
         parseResult.value!, // eslint-disable-line @typescript-eslint/no-non-null-assertion
         testFileProvider,
         {
-          fetchReusableWorkflowDepth: 1
+          fetchReusableWorkflowDepth: 1,
+          featureFlags: new FeatureFlags({
+            allowDeploymentKeyword: testOptions["allow-deployment-keyword"]
+          })
         }
       );
 

workflow-parser/testdata/reader/errors-job-environment-deployment-disabled-feature-default-go.yml

@@ -0,0 +1,21 @@
+include-source: false # Drop file/line/col from output
+skip:
+  - C#
+---
+on: push
+jobs:
+  build:
+    environment:
+      name: production
+      deployment: false
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo hi
+---
+{
+  "errors": [
+    {
+      "Message": ".github/workflows/errors-job-environment-deployment-disabled-feature-default-go.yml (Line: 6, Col: 7): The key 'deployment' is not allowed"
+    }
+  ]
+}

workflow-parser/testdata/reader/errors-job-environment-deployment-disabled-feature.yml

@@ -0,0 +1,21 @@
+include-source: false # Drop file/line/col from output
+skip:
+  - C#
+---
+on: push
+jobs:
+  build:
+    environment:
+      name: production
+      deployment: false
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo hi
+---
+{
+  "errors": [
+    {
+      "Message": ".github/workflows/errors-job-environment-deployment-disabled-feature.yml (Line: 6, Col: 7): The key 'deployment' is not allowed"
+    }
+  ]
+}

workflow-parser/testdata/reader/job-environment-deployment.yml

@@ -1,6 +1,7 @@
 include-source: false # Drop file/line/col from output
 skip:
   - C#
+allow-deployment-keyword: true
 ---
 on: push
 jobs: