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

make option --arch optional #24

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −3
Open

make option --arch optional #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ struct DownloadBinariesAction {
package: String,
#[clap(long)]
repository: String,
#[clap(long)]
#[clap(long, required=false)]
arch: String,
Copy link
Contributor

Choose a reason for hiding this comment

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

If it's optional make it an Option

#[clap(long)]
build_results_dir: Utf8PathBuf,
Expand Down
5 changes: 3 additions & 2 deletions src/pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ pub fn generate_monitor_pipeline(
("project", project.to_owned()),
("package", package.to_owned()),
("repository", repo.to_owned()),
("arch", arch.to_owned()),
Copy link
Collaborator

Choose a reason for hiding this comment

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

this doesn't actually work, a bunch of commands here do actually need --arch so the tests fail:

122 tests run: 26 passed, 96 failed, 0 skipped

Copy link
Author

Choose a reason for hiding this comment

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

Thank you. I tried cargo test but the tests got hung for me.

... snipped ...

test upload::tests::test_create_list_package ... ok
test handler::tests::test_handler_flow::dput_test_4::build_success_1::log_test_3::download_binaries_1::prune_only_if_job_unsuccessful_2 ... FAILED
test retry::tests::test_retry_on_nested_non_client_errors ... ok
test retry::tests::test_retry_on_non_client_errors ... ok
test handler::tests::test_handler_flow::dput_test_4::build_success_1::log_test_1::download_binaries_1::prune_only_if_job_unsuccessful_1 ... FAILED
test handler::tests::test_handler_flow::dput_test_4::build_success_1::log_test_2::download_binaries_1::prune_only_if_job_unsuccessful_1 ... FAILED

test monitor::tests::test_fails_after_repeated_duplicate_endtimes ... FAILED
test monitor::tests::test_handles_old_build_status has been running for over 60 seconds
test prune::tests::test_prune has been running for over 60 seconds
test retry::tests::test_no_retry_on_client_errors has been running for over 60 seconds
test retry::tests::test_no_retry_on_nested_client_errors has been running for over 60 seconds


^C

];

let mut monitor_args = vec![
Expand All @@ -96,7 +95,9 @@ pub fn generate_monitor_pipeline(
if let PipelineDownloadBinaries::OnSuccess { build_results_dir } =
&options.download_binaries
{
let mut download_args = vec![("build-results-dir", build_results_dir.clone())];
let mut download_args = vec![("build-results-dir", build_results_dir.clone()),
("arch", arch.to_owned()),
];
download_args.extend_from_slice(&common_args);
script.push(generate_command(
"download-binaries".to_owned(),
Expand Down
Loading