Skip to content

Commit 3353ca8

Browse files
committed
fix: Format code and update test snapshots for PR auto-detection
- Run cargo fmt to fix code formatting issues - Update help text in test snapshots to match new PR number auto-detection behavior - All build-related tests now pass except one unrelated flaky test
1 parent 31e9bc1 commit 3353ca8

File tree

3 files changed

+19
-24
lines changed

3 files changed

+19
-24
lines changed

src/commands/build/upload.rs

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,23 @@ use crate::utils::vcs::{
2828
};
2929

3030
fn get_default_pr_number() -> Option<u32> {
31-
std::env::var("GITHUB_REF")
32-
.ok()
33-
.and_then(|github_ref| {
34-
if let Ok(event_name) = std::env::var("GITHUB_EVENT_NAME") {
35-
if event_name == "pull_request" && github_ref.starts_with("refs/pull/") {
36-
let pr_number_str = github_ref
37-
.strip_prefix("refs/pull/")?
38-
.split('/')
39-
.next()?;
40-
if let Ok(pr_number) = pr_number_str.parse::<u32>() {
41-
debug!("Auto-detected PR number from GitHub Actions: {}", pr_number);
42-
Some(pr_number)
43-
} else {
44-
None
45-
}
31+
std::env::var("GITHUB_REF").ok().and_then(|github_ref| {
32+
if let Ok(event_name) = std::env::var("GITHUB_EVENT_NAME") {
33+
if event_name == "pull_request" && github_ref.starts_with("refs/pull/") {
34+
let pr_number_str = github_ref.strip_prefix("refs/pull/")?.split('/').next()?;
35+
if let Ok(pr_number) = pr_number_str.parse::<u32>() {
36+
debug!("Auto-detected PR number from GitHub Actions: {}", pr_number);
37+
Some(pr_number)
4638
} else {
4739
None
4840
}
4941
} else {
5042
None
5143
}
52-
})
44+
} else {
45+
None
46+
}
47+
})
5348
}
5449

5550
pub fn make_command(command: Command) -> Command {
@@ -630,19 +625,19 @@ mod tests {
630625
fn test_get_default_pr_number() {
631626
std::env::set_var("GITHUB_EVENT_NAME", "pull_request");
632627
std::env::set_var("GITHUB_REF", "refs/pull/123/merge");
633-
628+
634629
let pr_number = get_default_pr_number();
635630
assert_eq!(pr_number, Some(123));
636-
631+
637632
std::env::set_var("GITHUB_EVENT_NAME", "push");
638633
let pr_number = get_default_pr_number();
639634
assert_eq!(pr_number, None);
640-
635+
641636
std::env::set_var("GITHUB_EVENT_NAME", "pull_request");
642637
std::env::set_var("GITHUB_REF", "refs/heads/main");
643638
let pr_number = get_default_pr_number();
644639
assert_eq!(pr_number, None);
645-
640+
646641
std::env::remove_var("GITHUB_EVENT_NAME");
647642
std::env::remove_var("GITHUB_REF");
648643
}

tests/integration/_cases/build/build-upload-help-macos.trycmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ Options:
4545
The reference (branch) to use for the upload. If not provided, the current reference will
4646
be used.
4747
--pr-number <pr_number>
48-
The pull request number to use for the upload. If not provided, the current pull request
49-
number will be used.
48+
The pull request number to use for the upload. If not provided, the PR number will be
49+
automatically detected from GitHub Actions environment variables.
5050
--build-configuration <build_configuration>
5151
The build configuration to use for the upload. If not provided, the current version will
5252
be used.

tests/integration/_cases/build/build-upload-help-not-macos.trycmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ Options:
4444
The reference (branch) to use for the upload. If not provided, the current reference will
4545
be used.
4646
--pr-number <pr_number>
47-
The pull request number to use for the upload. If not provided, the current pull request
48-
number will be used.
47+
The pull request number to use for the upload. If not provided, the PR number will be
48+
automatically detected from GitHub Actions environment variables.
4949
--build-configuration <build_configuration>
5050
The build configuration to use for the upload. If not provided, the current version will
5151
be used.

0 commit comments

Comments
 (0)