Skip to content

Commit 0646419

Browse files
committed
merge in main
2 parents e659c7b + 0ecfc1e commit 0646419

4 files changed

Lines changed: 16737 additions & 46 deletions

File tree

.github/workflows/pre-prepare.yml

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

.github/workflows/release.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
- "major"
1414
- "minor"
1515
- "patch"
16+
update-language-server:
17+
required: true
18+
description: "Update the language server to the latest version?"
19+
type: boolean
20+
1621

1722
jobs:
1823
create-release-pr:
@@ -47,6 +52,18 @@ jobs:
4752
git push --set-upstream origin release/$NEW_VERSION
4853
4954
echo "new_version=$NEW_VERSION" >> $GITHUB_ENV
55+
56+
- name: Update language server
57+
if: ${{ inputs.update-language-server }}
58+
run: |
59+
npm install @actions/languageserver@latest @actions/workflow-parser@latest --workspaces=false
60+
git checkout -- package.json
61+
npm i
62+
63+
- uses: stefanzweifel/git-auto-commit-action@v4
64+
with:
65+
branch: release/${{ env.new_version }}
66+
if: ${{ inputs.update-language-server }}
5067

5168
- name: Create PR
5269
run: |

script/bootstrap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@ function clone_repo() {
1515
repo_root="$(git rev-parse --show-toplevel)"
1616
root="$(dirname "$repo_root")"
1717

18+
# Copy working package-lock.json to workspace
19+
echo "Copy lock file to workspace..."
20+
cp "$repo_root"/script/workspace/package-lock.json "$root"
21+
1822
# Clone dependent repos
1923
echo "Cloning dependent repos..."
2024
clone_repo https://github.com/actions/languageservices "$root"/languageservices
2125

22-
2326
# Copy workspace files
2427
echo "Copying workspace files..."
2528
cp "$repo_root"/script/workspace/package.json "$root"

0 commit comments

Comments
 (0)