Changes to be compatible with crate2nix #143
Draft
+17
−6
Conversation
This file contains hidden or 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
Comment on lines
+46
to
+49
| crate_description!(), | ||
| crate_version!(), | ||
| built_info::GIT_VERSION, | ||
| built_info::TARGET, | ||
| built_info::TARGET_PLATFORM.unwrap_or("unknown target"), |
There was a problem hiding this comment.
The print_startup_string function is superseded by tracing::info!:
commons-operator/rust/operator-binary/src/main.rs
Lines 58 to 66 in c276cec
|
|
||
| #[derive(Parser)] | ||
| #[clap(about = built_info::PKG_DESCRIPTION, author = stackable_operator::cli::AUTHOR)] | ||
| #[clap(about, author)] |
There was a problem hiding this comment.
This is already done:
|
|
||
| mod built_info { | ||
| include!(concat!(env!("OUT_DIR"), "/built.rs")); | ||
| pub const TARGET_PLATFORM: Option<&str> = option_env!("TARGET"); |
There was a problem hiding this comment.
built_info seems to already export TARGET. But maybe that's different to what you want here?
See:
commons-operator/rust/operator-binary/src/main.rs
Lines 21 to 23 in c276cec
| use stackable_operator::cli::{Command, ProductOperatorRun}; | ||
|
|
||
| use clap::Parser; | ||
| use clap::{crate_description, crate_version, Parser}; |
There was a problem hiding this comment.
We get this info from built_info. Is there a difference?
Comment on lines
+6
to
+7
| // built's env module depends on a whole bunch of variables that crate2nix doesn't provide | ||
| // so we grab the specific env variables that we care about out ourselves instead. |
There was a problem hiding this comment.
Ohhh. This might make my comments useless. But who knows, maybe it works now?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
see stackabletech/operator-templating#212 for more details