Skip to content
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.

Sign up for GitHub

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

fix: rename rattler_build to rattler-build #877

Merged
merged 4 commits into from
May 27, 2024
Merged

fix: rename rattler_build to rattler-build #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4c440d
fix: rename rattler_build to rattler-build
baszalmstra May 27, 2024
6f71d5a
fix: test-data
baszalmstra May 27, 2024
8db1cff
fix: snapshots
baszalmstra May 27, 2024
e21abad
fix: final snapshot
baszalmstra May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/snapshots/rattler_build__metadata__test__read_full_recipe-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
source: src/metadata.rs
assertion_line: 733
expression: output_curl
---
recipe:
Expand Down Expand Up @@ -645,4 +646,4 @@ finalized_dependencies:
run_exports: ~
finalized_sources: ~
system_tools:
rattler_build: 0.12.1
rattler-build: 0.12.1
3 changes: 2 additions & 1 deletion src/snapshots/rattler_build__metadata__test__read_full_recipe.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
source: src/metadata.rs
assertion_line: 728
expression: output_rich
---
recipe:
Expand Down Expand Up @@ -391,4 +392,4 @@ finalized_dependencies:
run_exports: ~
finalized_sources: ~
system_tools:
rattler_build: 0.12.1
rattler-build: 0.12.1
3 changes: 2 additions & 1 deletion src/snapshots/rattler_build__metadata__test__read_recipe_with_sources.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
source: src/metadata.rs
assertion_line: 744
expression: git_source_output
---
recipe:
Expand Down Expand Up @@ -71,4 +72,4 @@ finalized_sources:
rev: df83c1edf287a756b8fc995e03e9632af0344777
target_directory: initial_version
system_tools:
rattler_build: 0.12.1
rattler-build: 0.12.1
3 changes: 2 additions & 1 deletion src/snapshots/rattler_build__system_tools__tests__serialize.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
source: src/system_tools.rs
assertion_line: 284
expression: json
---
{
"git": "3.0.0",
"install_name_tool": "2.0.0",
"patchelf": "1.0.0",
"rattler_build": "0.0.0"
"rattler-build": "0.0.0"
}
3 changes: 2 additions & 1 deletion src/system_tools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ pub enum ToolError {
#[serde(rename_all = "snake_case")]
pub enum Tool {
/// The rattler build tool itself
#[serde(rename = "rattler-build")]
RattlerBuild,
/// The patch tool
Patch,
Expand All @@ -43,7 +44,7 @@ impl std::fmt::Display for Tool {
f,
"{}",
match self {
Tool::RattlerBuild => "rattler_build".to_string(),
Tool::RattlerBuild => "rattler-build".to_string(),
Tool::Codesign => "codesign".to_string(),
Tool::Patch => "patch".to_string(),
Tool::Patchelf => "patchelf".to_string(),
Expand Down
2 changes: 1 addition & 1 deletion test-data/rendered_recipes/curl_recipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,4 +642,4 @@ finalized_dependencies:
constrains: []
run_exports: null
system_tools:
rattler_build: 0.12.1
rattler-build: 0.12.1
2 changes: 1 addition & 1 deletion test-data/rendered_recipes/git_source.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ finalized_sources:
rev: df83c1edf287a756b8fc995e03e9632af0344777
target_directory: initial_version
system_tools:
rattler_build: 0.12.1
rattler-build: 0.12.1
2 changes: 1 addition & 1 deletion test-data/rendered_recipes/rich_recipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,4 +391,4 @@ finalized_dependencies:
constrains: []
run_exports: null
system_tools:
rattler_build: 0.12.1
rattler-build: 0.12.1
Loading