switch all to main and pull

.github/workflows/publish.yml

@@ -1,18 +1,13 @@
 name: Create release PR
 
-run-name: Create release PR for new ${{ github.event.inputs.version }} version
+run-name: Create release PR for v${{ github.event.inputs.version }}
 
 on:
   workflow_dispatch:
     inputs:
       version:
         required: true
-        type: choice
+        description: "Version to bump `package.json` to (format: x.y.z)"
-        description: "What type of release is this"
-        options:
-          - "major"
-          - "minor"
-          - "patch"
 
 jobs:
   create-release-pr:
@@ -36,25 +31,21 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "GitHub Actions"
 
-          NEW_VERSION=$(./script/workflows/increment-version.sh ${{ inputs.version }})
+          git checkout -b release/${{ inputs.version }}
 
-          git checkout -b release/$NEW_VERSION
+          npx lerna version ${{ inputs.version }} --yes --no-push --no-git-tag-version --force-publish
-
-          npx lerna version $NEW_VERSION --yes --no-push --no-git-tag-version --force-publish
 
           git add **/package.json package-lock.json lerna.json
-          git commit -m "Release extension version $NEW_VERSION"
+          git commit -m "Release extension version ${{ inputs.version }}"
 
-          git push --set-upstream origin release/$NEW_VERSION
+          git push --set-upstream origin release/${{ inputs.version }}
-
-          echo "new_version=$NEW_VERSION" >> $GITHUB_ENV
 
       - name: Create PR
         run: |
           gh pr create \
-            --title "Release version ${{ env.new_version }}" \
+            --title "Release version ${{ inputs.version }}" \
-            --body "Release version ${{ env.new_version }}" \
+            --body "Release version ${{ inputs.version }}" \
             --base main \
-            --head release/${{ env.new_version }}
+            --head release/${{ inputs.version }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

expressions/package.json

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

expressions/src/lexer.ts

@@ -179,7 +179,6 @@ export class Lexer {
           break;
 
         case "'":
-        case '"':
           this.consumeString();
           break;
 
@@ -300,13 +299,8 @@ export class Lexer {
   }
 
   private consumeString() {
-    // TODO: Should I make these consume double quotes as well?
+    while ((this.peek() !== "'" || this.peekNext() === "'") && !this.atEnd()) {
-    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.4",
+  "version": "0.3.3",
   "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.4",
+    "@actions/languageservice": "^0.3.3",
-    "@actions/workflow-parser": "^0.3.4",
+    "@actions/workflow-parser": "^0.3.3",
     "@octokit/rest": "^19.0.7",
     "@octokit/types": "^9.0.0",
     "vscode-languageserver": "^8.0.2",

languageserver/src/file-provider.ts

@@ -2,8 +2,8 @@ import {File} from "@actions/workflow-parser/workflows/file";
 import {FileProvider} from "@actions/workflow-parser/workflows/file-provider";
 import {fileIdentifier} from "@actions/workflow-parser/workflows/file-reference";
 import {Octokit} from "@octokit/rest";
+import path from "path";
 import {TTLCache} from "./utils/cache";
-import vscodeURI from "vscode-uri/lib/umd";
 
 export function getFileProvider(
   client: Octokit | undefined,
@@ -31,10 +31,7 @@ export function getFileProvider(
         throw new Error("Local file references are not supported with this configuration");
       }
 
-      const workspaceURI = vscodeURI.URI.parse(workspace);
+      const file = await readFile(path.join(workspace, ref.path));
-      const refURI = vscodeURI.Utils.joinPath(workspaceURI, ref.path);
-      const file = await readFile(refURI.toString());
-
       if (!file) {
         throw new Error(`File not found: ${ref.path}`);
       }

languageservice/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/languageservice",
-  "version": "0.3.4",
+  "version": "0.3.3",
   "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.4",
+    "@actions/expressions": "^0.3.3",
-    "@actions/workflow-parser": "^0.3.4",
+    "@actions/workflow-parser": "^0.3.3",
     "vscode-languageserver-textdocument": "^1.0.7",
     "vscode-languageserver-types": "^3.17.2",
     "vscode-uri": "^3.0.7",

languageservice/sync-to-main.sh

@@ -0,0 +1,16 @@
+## This script syncs all five repositories to the current state of main. 
+## It will stash changes on the current branch, switch to main, pull and remain on main.
+
+echo "Syncing all repositories to main"
+
+# for each folder in the above directory 
+cd ..
+for d in */ ; do
+    cd $d
+    echo "Syncing $d"
+    echo "current branch: $(git rev-parse --abbrev-ref HEAD)"
+    git stash
+    git checkout main
+    git pull
+    cd ..
+done

lerna.json

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

package-lock.json

@@ -135,7 +135,7 @@
     },
     "expressions": {
       "name": "@actions/expressions",
-      "version": "0.3.4",
+      "version": "0.3.3",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.0.3",
@@ -395,11 +395,11 @@
     },
     "languageserver": {
       "name": "@actions/languageserver",
-      "version": "0.3.4",
+      "version": "0.3.3",
       "license": "MIT",
       "dependencies": {
-        "@actions/languageservice": "^0.3.4",
+        "@actions/languageservice": "^0.3.3",
-        "@actions/workflow-parser": "^0.3.4",
+        "@actions/workflow-parser": "^0.3.3",
         "@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.4",
+      "version": "0.3.3",
       "license": "MIT",
       "dependencies": {
-        "@actions/expressions": "^0.3.4",
+        "@actions/expressions": "^0.3.3",
-        "@actions/workflow-parser": "^0.3.4",
+        "@actions/workflow-parser": "^0.3.3",
         "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.4",
+      "version": "0.3.3",
       "license": "MIT",
       "dependencies": {
-        "@actions/expressions": "^0.3.4",
+        "@actions/expressions": "^0.3.3",
         "cronstrue": "^2.21.0",
         "yaml": "^2.0.0-8"
       },

script/workflows/increment-version.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-VERSION=$(cat lerna.json | jq -r '.version')
-
-MAJOR=$(echo $VERSION | cut -d. -f1) 
-MINOR=$(echo $VERSION | cut -d. -f2)
-PATCH=$(echo $VERSION | cut -d. -f3)
-
-if [ "$1" == "major" ]; then
-  MAJOR=$((MAJOR+1))
-  MINOR=0
-  PATCH=0
-elif [ "$1" == "minor" ]; then
-  MINOR=$((MINOR+1))
-  PATCH=0
-elif [ "$1" == "patch" ]; then
-  PATCH=$((PATCH+1))
-else
-  echo "Invalid version type. Use 'major', 'minor' or 'patch'"
-  exit 1
-fi
-
-NEW_VERSION="$MAJOR.$MINOR.$PATCH"
-echo $NEW_VERSION 

workflow-parser/package.json

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

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

@@ -577,8 +577,7 @@
       "mapping": {
         "properties": {
           "types": "merge-group-activity",
-          "branches": "event-branches",
+          "branches": "event-branches"
-          "branches-ignore": "event-branches-ignore"
         }
       }
     },

workflow-parser/testdata/reader/events-mapping-all.yml

@@ -73,10 +73,8 @@ on:
       - deleted
   merge_group:
     branches: 
-      - master 
+        - master 
-      - main
+        - main
-    branches-ignore:
-      - develop
     types: 
       - checks_requested
   milestone:
@@ -323,9 +321,6 @@ jobs:
         "master",
         "main"
       ],
-      "branches-ignore": [
-        "develop"
-      ],
       "types": [
         "checks_requested"
       ]