switch all to main and pull

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",

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,10 +43,10 @@
     "watch": "tsc --build tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@actions/languageservice": "^0.3.4",
-    "@actions/workflow-parser": "^0.3.4",
+    "@actions/languageservice": "^0.3.3",
+    "@actions/workflow-parser": "^0.3.3",
     "@octokit/rest": "^19.0.7",
-    "@octokit/types": "^9.1.2",
+    "@octokit/types": "^9.0.0",
     "vscode-languageserver": "^8.0.2",
     "vscode-languageserver-textdocument": "^1.0.7",
     "yaml": "^2.1.3"

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 refURI = vscodeURI.Utils.joinPath(workspaceURI, ref.path);
-      const file = await readFile(refURI.toString());
-
+      const file = await readFile(path.join(workspace, ref.path));
       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/workflow-parser": "^0.3.4",
+    "@actions/expressions": "^0.3.3",
+    "@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,13 +395,13 @@
     },
     "languageserver": {
       "name": "@actions/languageserver",
-      "version": "0.3.4",
+      "version": "0.3.3",
       "license": "MIT",
       "dependencies": {
-        "@actions/languageservice": "^0.3.4",
-        "@actions/workflow-parser": "^0.3.4",
+        "@actions/languageservice": "^0.3.3",
+        "@actions/workflow-parser": "^0.3.3",
         "@octokit/rest": "^19.0.7",
-        "@octokit/types": "~9.1.2",
+        "@octokit/types": "^9.0.0",
         "vscode-languageserver": "^8.0.2",
         "vscode-languageserver-textdocument": "^1.0.7",
         "yaml": "^2.1.3"
@@ -462,16 +462,16 @@
       }
     },
     "languageserver/node_modules/@octokit/openapi-types": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-17.0.0.tgz",
-      "integrity": "sha512-V8BVJGN0ZmMlURF55VFHFd/L92XQQ43KvFjNmY1IYbCN3V/h/uUFV6iQi19WEHM395Nn+1qhUbViCAD/1czzog=="
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
     },
     "languageserver/node_modules/@octokit/types": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.1.2.tgz",
-      "integrity": "sha512-LPbJIuu1WNoRHbN4UMysEdlissRFpTCWyoKT7kHPufI8T+XX33/qilfMWJo3mCOjNIKu0+43oSQPf+HJa0+TTQ==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
       "dependencies": {
-        "@octokit/openapi-types": "^17.0.0"
+        "@octokit/openapi-types": "^16.0.0"
       }
     },
     "languageserver/node_modules/argparse": {
@@ -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/workflow-parser": "^0.3.4",
+        "@actions/expressions": "^0.3.3",
+        "@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"
       },

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-ignore": "event-branches-ignore"
+          "branches": "event-branches"
         }
       }
     },

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

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