Skip to content

Commit e37bd00

Browse files
authored
Fix not able to open workspace with nightly code (#20029)
* Build latest image * debug * Fix restart workspace editor version * revert nightly job * fixup * Revert "debug" This reverts commit be496bc.
1 parent 4bccf52 commit e37bd00

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

Diff for: .github/workflows/code-nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: |
3636
export LEEWAY_WORKSPACE_ROOT=$GITHUB_WORKSPACE
3737
38-
codeHeadCommit=$(curl -H 'Accept: application/vnd.github.VERSION.sha' https://api.github.com/repos/gitpod-io/openvscode-server/commits/gp-code/release/1.91)
38+
codeHeadCommit=$(curl -H 'Accept: application/vnd.github.VERSION.sha' https://api.github.com/repos/gitpod-io/openvscode-server/commits/gp-code/main)
3939
codeVersion=$(curl https://raw.githubusercontent.com/gitpod-io/openvscode-server/$codeHeadCommit/package.json | jq .version)
4040
imageRepoBase=${{ github.ref == 'refs/heads/main' && 'eu.gcr.io/gitpod-core-dev/build' || 'eu.gcr.io/gitpod-dev-artifact/build' }}
4141
cd components/ide/code

Diff for: components/server/src/workspace/workspace-starter.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,10 @@ export class WorkspaceStarter {
308308
ideSettings = {
309309
...ideSettings,
310310
defaultIde: ideConfig.ide,
311-
useLatestVersion: !!ideConfig.useLatest,
311+
useLatestVersion:
312+
ideSettings?.useLatestVersion ??
313+
user.additionalData?.ideSettings?.useLatestVersion ??
314+
!!ideConfig.useLatest,
312315
};
313316
}
314317
}

Diff for: install/installer/pkg/components/blobserve/configmap.go

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
3434
InlineStatic: []blobserve_config.InlineReplacement{{
3535
Search: "{{WORKBENCH_WEB_BASE_URL}}",
3636
Replacement: "${ide}",
37+
}, {
38+
Search: "{{WORKBENCH_NLS_FALLBACK_URL}}",
39+
Replacement: "${ide}/out/nls.messages.js",
40+
}, {
41+
Search: "{{WORKBENCH_NLS_URL}}",
42+
Replacement: "${ide}/out/nls.messages.js",
3743
}, {
3844
Search: "/_supervisor/frontend",
3945
Replacement: "${supervisor}",

0 commit comments

Comments
 (0)