Publish things under the new name (gel-server, gel-cli, gel-ls) #137
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original package definitions remain unchanged so that back branches can continue to be built and published as `edgedb`. .deb and .rpm platforms publish "transitional" packages with old names which pull the new-named package as the dependency.
aljazerzen
approved these changes
Feb 10, 2025
Comment on lines
+62
to
+74
| def get_prepare_script(self, build: targets.Build) -> str: | ||
| script = super().get_prepare_script(build) | ||
| sed = build.sh_get_command("sed") | ||
| src = build.get_source_dir(self, relative_to="pkgbuild") | ||
| script += textwrap.dedent( | ||
| f"""\ | ||
| {sed} -i -e '/\\[\\[bin\\]\\]/,/\\[\\[.*\\]\\]/{{ | ||
| s/^name\\s*=.*/name = "{self.marketing_slug}"/; | ||
| }}' \\ | ||
| "{src}/Cargo.toml" | ||
| """ | ||
| ) | ||
| return script |
There was a problem hiding this comment.
Just rename the binary after compilation.
There was a problem hiding this comment.
I'm not sure that would be simpler. Is there a downside in doing it the sed way?
There was a problem hiding this comment.
I'd consider /\\[\\[bin\\]\\]/,/\\[\\[.*\\]\\]/ a downside.
But if you don't go ahead.
Comment on lines
+82
to
+100
| class EdgeDBCLI(GelCLI): | ||
| title = "EdgeDBCLI" | ||
| ident = "edgedb-cli" | ||
| description = "EdgeDB Command Line Tools" | ||
| url = "https://edgedb.com/" | ||
|
|
||
| @property | ||
| def marketing_name(self) -> str: | ||
| return "EdgeDB" | ||
|
|
||
| @property | ||
| def marketing_slug(self) -> str: | ||
| return "edgedb" | ||
|
|
||
| def get_transition_packages( | ||
| self, | ||
| build: targets.Build, | ||
| ) -> list[str]: | ||
| return [] |
There was a problem hiding this comment.
CLI has a default feature gel, which controls what we write out in messages (Connecting to Gel Cloud/Connecting to EdgeDB Cloud).
I think you'd want to disable that feature for the edgedb-cli package. Cargo has --no-default-features.
There was a problem hiding this comment.
The edgedb-cli package is intended for old branches, we shouldn't be building new CLIs with that class.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Original package definitions remain unchanged so that back branches can
continue to be built and published as
edgedb. .deb and .rpm platformspublish "transitional" packages with old names which pull the new-named
package as the dependency.