Skip to content

[rebuild] decouple IDE env vars from registry-facade #16812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2023
Merged

Conversation

akosyakov
Copy link
Member

@akosyakov akosyakov commented Mar 12, 2023

Description

by moving in supervisor-ide-config.json

It ensures proper IDE env vars in a workspace started by gp rebuild.

Related Issue(s)

Fixes #

How to test

  • Start workspace with different IDEs like VS Code Browser, Desktop and IntelliJ. Check that gp open, gp preview and code works for task and regular IDE terminals.
    • VS Code Browser
    • VS Code Desktop
    • IntelliJ
  • Check that with gp rebuild for VS Code Browser and Desktop (opened from a file menu) gp open, gp preview and code works too.
    • VS Code Browser
    • VS Code Desktop

Release Notes

NONE

Documentation

Build Options:

  • /werft with-werft
    Run the build with werft instead of GHA
  • leeway-no-cache
  • /werft no-test
    Run Leeway with --dont-test
Publish Options
  • /werft publish-to-npm
  • /werft publish-to-jb-marketplace
Installer Options
  • with-ee-license
  • with-dedicated-emulation
  • with-ws-manager-mk2
  • workspace-feature-flags
    Add desired feature flags to the end of the line above, space separated

Preview Environment Options:

  • /werft with-local-preview
    If enabled this will build install/preview
  • /werft with-preview
  • /werft with-large-vm
  • /werft with-gce-vm
    If enabled this will create the environment on GCE infra
  • /werft with-integration-tests=all
    Valid options are all, workspace, webapp, ide, jetbrains, vscode, ssh

@werft-gitpod-dev-com
Copy link

started the job as gitpod-build-ak-rebuild-ide-env.1 because the annotations in the pull request description changed
(with .werft/ from main)

@akosyakov
Copy link
Member Author

akosyakov commented Mar 12, 2023

@csweichel should we also clean up the logic in registry-facade handling GITPOD_ENV_ modifiers? Nobody besides IDEs were using them. Or does not matter? (with another PR when all images are updated though).

@akosyakov akosyakov force-pushed the ak/rebuild_ide_env branch 2 times, most recently from 42e2e0d to f83a383 Compare March 12, 2023 19:13
@roboquat roboquat added size/XL and removed size/L labels Mar 12, 2023
@akosyakov akosyakov force-pushed the ak/rebuild_ide_env branch from f83a383 to 3b8cdc8 Compare March 12, 2023 19:36
@akosyakov akosyakov marked this pull request as ready for review March 12, 2023 20:05
@akosyakov akosyakov requested a review from a team March 12, 2023 20:05
@akosyakov
Copy link
Member Author

I tested all possible cases with stable. All looks good. gp rebuild now also has proper env vars, eg PATH.

@akosyakov
Copy link
Member Author

/hold

since the final image should be rebuilt to support VS Code Browser 1.76.1, it is fine to review though

@akosyakov akosyakov force-pushed the ak/rebuild_ide_env branch from 09c60f2 to beb7514 Compare March 13, 2023 11:05
@akosyakov
Copy link
Member Author

/unhold

rebased and fixed VS Code image

@@ -6,5 +6,14 @@
"http": {
"path": "version"
}
},
"env": {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@filiptronicek you will need to adjust Xterm example after deployment

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the heads up!

Copy link
Member

@filiptronicek filiptronicek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried gp open on both regular workspace and inside of the debug workspace. Works in both cases

@roboquat roboquat merged commit f260c31 into main Mar 13, 2023
@roboquat roboquat deleted the ak/rebuild_ide_env branch March 13, 2023 12:24
@roboquat roboquat added deployed: IDE IDE change is running in production deployed Change is completely running in production labels Mar 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployed: IDE IDE change is running in production deployed Change is completely running in production release-note-none size/XL team: IDE
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants