Skip to content

Commit e3c321d

Browse files
authored
Merge pull request #37 from github/joshmgross/update-workspace
Update dev workspace with new language service repository
2 parents aa38def + d9243a3 commit e3c321d

File tree

6 files changed

+12
-15
lines changed

6 files changed

+12
-15
lines changed

script/bootstrap

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ root="$(dirname "$repo_root")"
1717

1818
# Clone dependent repos
1919
echo "Cloning dependent repos..."
20-
clone_repo https://github.com/github/actions-languageservices "$root"/actions-languageservices
20+
clone_repo https://github.com/actions/languageservices "$root"/languageservices
2121

2222

2323
# Copy workspace files
2424
echo "Copying workspace files..."
2525
cp "$repo_root"/script/workspace/package.json "$root"
2626
cp "$repo_root"/script/workspace/vscode-github-actions.code-workspace "$root"
27-
cp "$repo_root"/script/workspace/.npmrc "$root"
2827
cp "$repo_root"/script/workspace/update-package-locks.sh "$root"
2928
cp "$repo_root"/script/workspace/watch.sh "$root"

script/workspace/.npmrc

Lines changed: 0 additions & 2 deletions
This file was deleted.

script/workspace/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"private": true,
33
"workspaces": [
4-
"./actions-languageservices/expressions",
5-
"./actions-languageservices/workflow-parser",
6-
"./actions-languageservices/languageservice",
7-
"./actions-languageservices/languageserver",
4+
"./languageservices/expressions",
5+
"./languageservices/workflow-parser",
6+
"./languageservices/languageservice",
7+
"./languageservices/languageserver",
88
"./vscode-github-actions"
99
]
10-
}
10+
}

script/workspace/update-package-locks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33

4-
for DIR in "actions-languageservices" "vscode-github-actions"
4+
for DIR in "languageservices" "vscode-github-actions"
55
do
66
pushd $DIR
77
# Trigger an npm i without workspaces support to update the local package-lock.json

script/workspace/vscode-github-actions.code-workspace

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"folders": [
3-
{"path": "./actions-languageservices/expressions"},
4-
{"path": "./actions-languageservices/workflow-parser"},
5-
{"path": "./actions-languageservices/languageservice"},
6-
{"path": "./actions-languageservices/languageserver"},
3+
{"path": "./languageservices/expressions"},
4+
{"path": "./languageservices/workflow-parser"},
5+
{"path": "./languageservices/languageservice"},
6+
{"path": "./languageservices/languageserver"},
77
{"path": "./vscode-github-actions"}
88
],
99
"extensions": {

script/workspace/watch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# allow killing all processes with ctrl-c
44
trap 'kill 0' SIGINT
55

6-
for DIR in "actions-languageservices/expressions" "actions-languageservices/workflow-parser" "actions-languageservices/languageservice" "actions-languageservices/languageserver" "vscode-github-actions"
6+
for DIR in "languageservices/expressions" "languageservices/workflow-parser" "languageservices/languageservice" "languageservices/languageserver" "vscode-github-actions"
77
do
88
pushd $DIR
99
npm run watch &

0 commit comments

Comments
 (0)