Skip to content

Commit b06842b

Browse files
jeanp413roboquat
authored andcommitted
Install gitpod.gitpod-theme as builtin extension
The extension is already bundled when building vscode, this will only update the extension to a newer version if any exist. If there's no access to openvsx for some reason (self-hosted case) bundled version will be used.
1 parent cb04a49 commit b06842b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

WORKSPACE.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defaultArgs:
77
jbMarketplacePublishTrigger: "false"
88
publishToJBMarketplace: true
99
localAppVersion: unknown
10-
codeCommit: 64ebb59829c0d3998ebf6b69308aafd49362d29c
10+
codeCommit: 9d98f338d0c8584b66195fceb555bb7223c755bc
1111
codeQuality: stable
1212
jetbrainsBackendQualifier: stable
1313
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2022.1.1.tar.gz"

components/ide/code/codehelper/main.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func main() {
5151
log.WithField("cost", time.Now().Local().Sub(startTime).Milliseconds()).Info("content available")
5252

5353
// code server args install extension with id
54-
args := []string{"--start-server"}
54+
args := []string{}
5555

5656
// install extension with filepath
5757
extPathArgs := []string{}
@@ -60,6 +60,8 @@ func main() {
6060
args = append(args, "--inspect", "--log=trace")
6161
}
6262

63+
args = append(args, "--install-builtin-extension", "gitpod.gitpod-theme")
64+
6365
wsContextUrl := wsInfo.GetWorkspaceContextUrl()
6466
if ctxUrl, err := url.Parse(wsContextUrl); err == nil {
6567
if ctxUrl.Host == "github.com" {
@@ -107,6 +109,7 @@ func main() {
107109
// install extensions and run code server with exec
108110
args = append(args, os.Args[1:]...)
109111
args = append(args, "--do-not-sync")
112+
args = append(args, "--start-server")
110113
log.WithField("cost", time.Now().Local().Sub(startTime).Milliseconds()).Info("starting server")
111114
if err := syscall.Exec(Code, append([]string{"gitpod-code"}, args...), os.Environ()); err != nil {
112115
log.WithError(err).Error("install ext and start code server failed")

0 commit comments

Comments
 (0)