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

[xa-prep-tasks] fix build errors for long darc- branch names #9740

Merged
merged 1 commit into from
Feb 3, 2025
Merged

[xa-prep-tasks] fix build errors for long darc- branch names #9740

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
22 changes: 17 additions & 5 deletions build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public override bool Execute ()
if (!string.IsNullOrEmpty (build_sourcebranchname) && build_sourcebranchname.IndexOf ("merge", StringComparison.OrdinalIgnoreCase) == -1) {
Branch = build_sourcebranchname.Replace ("refs/heads/", string.Empty);
Log.LogMessage ($"Using BUILD_SOURCEBRANCH value: {Branch}");
return true;
goto done;
}

string gitHeadFile = Path.Combine (WorkingDirectory.ItemSpec, ".git", "HEAD");
Expand All @@ -48,15 +48,27 @@ public override bool Execute ()
base.Execute ();
}

done:
CheckBranchLength ();
Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Branch)}: {Branch}");
return !Log.HasLoggedErrors;
}

void CheckBranchLength ()
{
// Trim generated dependabot branch names that are too long to produce useful package names
const int maxBranchLength = 32;
var lastSlashIndex = Branch.LastIndexOf ('/');
if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > 60) {
if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > maxBranchLength) {
Log.LogMessage ($"Trimming characters from the branch name at index {lastSlashIndex}: {Branch}");
Branch = Branch.Substring (lastSlashIndex + 1);
}

Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Branch)}: {Branch}");

return !Log.HasLoggedErrors;
// Trim darc/Maestro branch names that are too long
if (Branch.StartsWith ("darc-") && Branch.Length > maxBranchLength) {
Log.LogMessage ($"Trimming to {maxBranchLength} characters from the branch name: {Branch}");
Branch = Branch.Substring (0, maxBranchLength);
}
}

protected override string GenerateCommandLineCommands ()
Expand Down
Loading