Skip to content

Commit 3c61d96

Browse files
GirlBossRushTeffen Ellis
authored and
Teffen Ellis
committed
Bump vscode.
- Fix issue where yarn lock cannot be updated in development.
1 parent 7925f88 commit 3c61d96

File tree

4 files changed

+430
-13
lines changed

4 files changed

+430
-13
lines changed

ci/dev/postinstall.sh

+10-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ set -euo pipefail
44
main() {
55
cd "$(dirname "$0")/../.."
66

7-
echo 'Installing code-server test dependencies...'
7+
echo "Installing code-server test dependencies..."
88

99
cd test
1010
yarn install
1111
cd ..
1212

1313
cd vendor
14-
echo 'Installing vendor dependencies...'
14+
echo "Installing vendor dependencies..."
1515

1616
# * We install in 'modules' instead of 'node_modules' because VS Code's extensions
1717
# use a webpack config which cannot differentiate between its own node_modules
@@ -21,7 +21,14 @@ main() {
2121
# devDependencies are not needed, and that even git repo based packages are
2222
# assumed to be compiled. Because the default behavior for VS Code's `postinstall`
2323
# assumes we're also compiled, this needs to be ignored.
24-
yarn install --modules-folder modules --ignore-scripts --frozen-lockfile
24+
25+
local args=(install --modules-folder modules --ignore-scripts)
26+
27+
if [[ ${CI-} ]]; then
28+
args+=("--frozen-lockfile")
29+
fi
30+
31+
yarn "${args[@]}"
2532

2633
# Finally, run the vendor `postinstall`
2734
yarn run postinstall

docs/MAINTAINING.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
Current maintainers:
2121

2222
- @code-asher
23+
- @TeffenEllis
2324
- @oxy
2425
- @jsjoeio
2526

vendor/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"postinstall": "./postinstall.sh"
88
},
99
"devDependencies": {
10-
"code-oss-dev": "cdr/vscode#96a09a7846538c3bbedb6a2aeca729537bb8202b"
10+
"code-oss-dev": "cdr/vscode#9cb5fb3759f46b10bc66e676fa7f44c51e84824b"
1111
}
1212
}

0 commit comments

Comments
 (0)