Skip to content

Commit

Permalink
feat: support fuel-core-keygen binary (#472)
Browse files Browse the repository at this point in the history
* feat: support fuel-core-keygen binary

* fix: update keygen test entries

* fix: update test_collect_exclude_plugins test
  • Loading branch information
kayagokalp authored Aug 16, 2023
1 parent 274f8f0 commit fff9083
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
2 changes: 2 additions & 0 deletions ci/build-channel/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ fn write_document(
println!("\nWriting package info for component '{}'", &component.name);
let tag_prefix = if component.name == "forc" {
"forc-binaries"
} else if component.name == "fuel-core" || component.name == "fuel-core-keygen" {
"fuel-core"
} else {
&component.name
};
Expand Down
4 changes: 2 additions & 2 deletions component/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ targets = ["linux_amd64", "linux_arm64", "darwin_amd64", "darwin_arm64"]
.iter()
.map(|c| c.name.clone())
.collect::<Vec<String>>();
let mut expected = ["forc", "fuel-core", "fuel-indexer"];
let mut expected = ["forc", "fuel-core", "fuel-indexer", "fuel-core-keygen"];
expected.sort();
assert_eq!(components.len(), 3);
assert_eq!(components.len(), 4);
assert_eq!(actual, expected);
Ok(())
}
Expand Down
8 changes: 8 additions & 0 deletions components.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ repository_name = "fuel-core"
targets = [ "aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "aarch64-apple-darwin", "x86_64-apple-darwin" ]
publish = true

[component.fuel-core-keygen]
name = "fuel-core-keygen"
tarball_prefix = "fuel-core"
executables = ["fuel-core-keygen"]
repository_name = "fuel-core"
targets = [ "aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "aarch64-apple-darwin", "x86_64-apple-darwin" ]
publish = true

[component.forc-wallet]
name = "forc-wallet"
tarball_prefix = "forc-wallet"
Expand Down
7 changes: 7 additions & 0 deletions tests/show.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ latest-{target} (default)
- forc-tx : 0.1.0
- forc-wallet : 0.1.0
fuel-core : 0.1.0
fuel-core-keygen - not found
fuel-indexer : 0.1.0
"#
);
Expand Down Expand Up @@ -86,6 +87,7 @@ latest-{target} (default)
- forc-tx : 0.1.0
- forc-wallet : 0.1.0
fuel-core : 0.1.0
fuel-core-keygen - not found
fuel-indexer : 0.1.0
"#
);
Expand Down Expand Up @@ -119,6 +121,7 @@ nightly-{target} (default)
- forc-tx : 0.2.0
- forc-wallet : 0.2.0
fuel-core : 0.2.0
fuel-core-keygen - not found
fuel-indexer : 0.2.0
"#
);
Expand Down Expand Up @@ -162,6 +165,7 @@ my_toolchain (default)
- forc-tx - not found
- forc-wallet - not found
fuel-core - not found
fuel-core-keygen - not found
fuel-indexer - not found
"#;
assert!(stdout.contains(expected_stdout));
Expand Down Expand Up @@ -204,6 +208,7 @@ beta-1-{target} (override), path: {}
- forc-tx - not found
- forc-wallet - not found
fuel-core - not found
fuel-core-keygen - not found
fuel-indexer - not found
"#,
cfg.home.join(FUEL_TOOLCHAIN_TOML_FILE).display()
Expand Down Expand Up @@ -249,6 +254,7 @@ latest-{target} (default)
- forc-tx : 0.1.0
- forc-wallet : 0.1.0
fuel-core : 0.1.0
fuel-core-keygen - not found
fuel-indexer : 0.1.0
"#,
);
Expand Down Expand Up @@ -296,6 +302,7 @@ latest-{target} (default)
- forc-tx : 0.2.0
- forc-wallet : 0.2.0
fuel-core : 0.2.0
fuel-core-keygen - not found
fuel-indexer : 0.2.0
"#;
assert!(stdout.contains(expected_stdout));
Expand Down

0 comments on commit fff9083

Please sign in to comment.