Merge branch 'main' into jtamsut/tokenize-double-quotes

.github/workflows/publish.yml

@@ -51,11 +51,9 @@ jobs:
 
       - name: Create PR
         run: |
-          LAST_PR=$(gh pr list --repo ${{ github.repository }} --limit 1 --state merged --search "Release version" --json number | jq -r '.[0].number')
-          ./script/workflows/generate-release-notes.sh $LAST_PR ${{ env.new_version }}
           gh pr create \
             --title "Release version ${{ env.new_version }}" \
-            --body-file releasenotes.md \
+            --body "Release version ${{ env.new_version }}" \
             --base main \
             --head release/${{ env.new_version }}
         env:

expressions/package.json

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

expressions/src/lexer.ts

@@ -179,6 +179,7 @@ export class Lexer {
           break;
 
         case "'":
+        case '"':
           this.consumeString();
           break;
 
@@ -299,8 +300,13 @@ export class Lexer {
   }
 
   private consumeString() {
-    while ((this.peek() !== "'" || this.peekNext() === "'") && !this.atEnd()) {
+    // TODO: Should I make these consume double quotes as well?
+    const isSingleQuote = this.peek() !== "'" || this.peekNext() === "'";
+    const isDoubleQuote = this.peek() !== '"' || this.peekNext() === '"';
+
+    while ((isSingleQuote || isDoubleQuote) && !this.atEnd()) {
       if (this.peek() === "\n") this.line++;
+      // TODO: Should I also add this for double quotes?
       if (this.peek() === "'" && this.peekNext() === "'") {
         // Escaped "'", consume
         this.next();

languageserver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/languageserver",
-  "version": "0.3.5",
+  "version": "0.3.4",
   "description": "Language server for GitHub Actions",
   "license": "MIT",
   "type": "module",
@@ -43,8 +43,8 @@
     "watch": "tsc --build tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@actions/languageservice": "^0.3.5",
-    "@actions/workflow-parser": "^0.3.5",
+    "@actions/languageservice": "^0.3.4",
+    "@actions/workflow-parser": "^0.3.4",
     "@octokit/rest": "^19.0.7",
     "@octokit/types": "^9.0.0",
     "vscode-languageserver": "^8.0.2",

languageserver/src/context-providers/secrets.ts

@@ -28,7 +28,6 @@ export async function getSecrets(
   }
 
   const eventsConfig = workflowContext?.template?.events;
-
   if (eventsConfig?.workflow_call) {
     // Unpredictable secrets may be passed in via a workflow_call trigger
     secretsContext.complete = false;
@@ -39,7 +38,6 @@ export async function getSecrets(
   }
 
   let environmentName: string | undefined;
-
   if (workflowContext?.job?.environment) {
     if (isString(workflowContext.job.environment)) {
       environmentName = workflowContext.job.environment.value;
@@ -48,17 +46,10 @@ export async function getSecrets(
         if (isString(x.key) && x.key.value === "name") {
           if (isString(x.value)) {
             environmentName = x.value.value;
-          } else {
-            // this means we have a dynamic enviornment, in those situations we
-            // want to make sure we skip doing secret validation
-            secretsContext.complete = false;
           }
           break;
         }
       }
-    } else {
-      // if the expression is something like environment: ${{ ... }} then we want to skip validation
-      secretsContext.complete = false;
     }
   }
 

languageservice/package.json

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

lerna.json

@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useWorkspaces": true,
-  "version": "0.3.5"
+  "version": "0.3.4"
 }

package-lock.json

@@ -135,7 +135,7 @@
     },
     "expressions": {
       "name": "@actions/expressions",
-      "version": "0.3.5",
+      "version": "0.3.4",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.0.3",
@@ -395,11 +395,11 @@
     },
     "languageserver": {
       "name": "@actions/languageserver",
-      "version": "0.3.5",
+      "version": "0.3.4",
       "license": "MIT",
       "dependencies": {
-        "@actions/languageservice": "^0.3.5",
-        "@actions/workflow-parser": "^0.3.5",
+        "@actions/languageservice": "^0.3.4",
+        "@actions/workflow-parser": "^0.3.4",
         "@octokit/rest": "^19.0.7",
         "@octokit/types": "^9.0.0",
         "vscode-languageserver": "^8.0.2",
@@ -678,11 +678,11 @@
     },
     "languageservice": {
       "name": "@actions/languageservice",
-      "version": "0.3.5",
+      "version": "0.3.4",
       "license": "MIT",
       "dependencies": {
-        "@actions/expressions": "^0.3.5",
-        "@actions/workflow-parser": "^0.3.5",
+        "@actions/expressions": "^0.3.4",
+        "@actions/workflow-parser": "^0.3.4",
         "vscode-languageserver-textdocument": "^1.0.7",
         "vscode-languageserver-types": "^3.17.2",
         "vscode-uri": "^3.0.7",
@@ -11720,10 +11720,10 @@
     },
     "workflow-parser": {
       "name": "@actions/workflow-parser",
-      "version": "0.3.5",
+      "version": "0.3.4",
       "license": "MIT",
       "dependencies": {
-        "@actions/expressions": "^0.3.5",
+        "@actions/expressions": "^0.3.4",
         "cronstrue": "^2.21.0",
         "yaml": "^2.0.0-8"
       },

releasenotes.md

@@ -1 +0,0 @@
-Release 0.3.5

script/workflows/generate-release-notes.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-# this script is used to generate release notes for a given release
-# first argument is the pull request id for the last release
-# the second is the new release number
-
-# the script then grabs every pull request merged since that pull request
-# and outputs a string of release notes
-
-# get the new release number
-NEW_RELEASE=$2
-
-echo "Generating release notes for $NEW_RELEASE"
-
-# get the last release pull request id
-LAST_RELEASE_PR=$1
-
-
-
-#get when the last release was merged
-LAST_RELEASE_MERGED_AT=$(gh pr view $LAST_RELEASE_PR --repo actions/languageservices --json mergedAt  | jq -r '.mergedAt')
-
-CHANGELIST=$(gh pr list --repo actions/languageservices --base main --state merged --json title --search "merged:>$LAST_RELEASE_MERGED_AT -label:no-release")
-
-# store the release notes in a variable so we can use it later
-
-echo "Release $NEW_RELEASE" >> releasenotes.md
-
-echo $CHANGELIST | jq -r '.[].title' | while read line; do
-  echo " - $line" >> releasenotes.md
-done
-
-echo " "

workflow-parser/README.md

@@ -35,7 +35,7 @@ jobs:
 );
 ```
 
-`convertWorkflowTemplate` then takes that intermediate representation and converts it to a [`WorkflowTemplate`](./src/model/workflow-template.ts) object, which is a more convenient representation for working with workflows.
+`convertWorkflowTemplate` then takes that intermediate representation and converts it to a [`WorkflowTemplate`](./src/workflow-template.ts) object, which is a more convenient representation for working with workflows.
 
 ```typescript
 const workflowTemplate = await convertWorkflowTemplate(result.context, result.value);

workflow-parser/package.json

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