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.

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

[ci] Use new DevDiv/android-platform-support repo #9366

Merged
merged 19 commits into from
Nov 21, 2024
Merged

Conversation

pjcollins
Copy link
Member

@pjcollins pjcollins commented Oct 3, 2024

Bumps external components to https://devdiv.visualstudio.com/DevDiv/_git/android-platform-support/commit/cdef164e7eef35128f74fa1f3ecbd7a878953a43

A new android-platform-support Azure Repo has been created in the DevDiv
project containing library code from the xamarin/androidtools,
xamarin/monodroid, and xamarin/android-sdk-installer repos.

The build has been updated to build and package all required closed
source components from the new Azure Repo.

@pjcollins pjcollins changed the title [ci] Test Azure repo checkout [ci] Use new DevDiv/android-platform-support repo Nov 18, 2024
@pjcollins pjcollins marked this pull request as ready for review November 18, 2024 16:49
@pjcollins pjcollins marked this pull request as draft November 18, 2024 16:53
@dellis1972
Copy link
Contributor

@pjcollins we are going to need to build the fast dev tooling somehow also. I don't think they are referenced from the debugging project.

@pjcollins
Copy link
Member Author

@pjcollins we are going to need to build the fast dev tooling somehow also. I don't think they are referenced from the debugging project.

As part of make jenkins we run dotnet build -t:BuildExternal Xamarin.Android.sln -- this command will still build the monodroid.proj file which has been brought forward into the new repo here - https://devdiv.visualstudio.com/DevDiv/_git/android-platform-support?path=/build-tools/monodroid.proj

This should continue to build the fastdev tools and ensure that Xamarin.Android.Build.Debugging.Tasks has the correct assembly version, but please double check my work here and make sure this all looks right!

@pjcollins pjcollins marked this pull request as ready for review November 18, 2024 19:44
@jonathanpeppers
Copy link
Member

I tried this branch, -t:Prepare worked, but then:

> .\dotnet-local.cmd build .\Xamarin.Android.sln -t:BuildExternal
Restore complete (1.5s)
  Xamarin.Android failed with 1 error(s) (0.0s)
    D:\src\xamarin-android\build-tools\scripts\DotNet.targets(12,5): error MSB6003:
      The specified task executable "cmd.exe" could not be run. System.IO.DirectoryNotFoundException: The working directory "D:\src\xamarin-android\build-tools\scripts\..\..\external\android-platform-support\build-tools" does not exist.
         at Microsoft.Build.Tasks.Exec.GetWorkingDirectory()
         at Microsoft.Build.Utilities.ToolTask.GetProcessStartInfo(String pathToTool, String commandLineCommands, String responseFileSwitch)
         at Microsoft.Build.Utilities.ToolTask.ExecuteTool(String pathToTool, String responseFileCommands, String commandLineCommands)
         at Microsoft.Build.Tasks.Exec.ExecuteTool(String pathToTool, String responseFileCommands, String commandLineCommands)
         at Microsoft.Build.Utilities.ToolTask.Execute()

What step should clone android-platform-support?

@pjcollins
Copy link
Member Author

I tried this branch, -t:Prepare worked, but then:

> .\dotnet-local.cmd build .\Xamarin.Android.sln -t:BuildExternal
Restore complete (1.5s)
  Xamarin.Android failed with 1 error(s) (0.0s)
    D:\src\xamarin-android\build-tools\scripts\DotNet.targets(12,5): error MSB6003:
      The specified task executable "cmd.exe" could not be run. System.IO.DirectoryNotFoundException: The working directory "D:\src\xamarin-android\build-tools\scripts\..\..\external\android-platform-support\build-tools" does not exist.
         at Microsoft.Build.Tasks.Exec.GetWorkingDirectory()
         at Microsoft.Build.Utilities.ToolTask.GetProcessStartInfo(String pathToTool, String commandLineCommands, String responseFileSwitch)
         at Microsoft.Build.Utilities.ToolTask.ExecuteTool(String pathToTool, String responseFileCommands, String commandLineCommands)
         at Microsoft.Build.Tasks.Exec.ExecuteTool(String pathToTool, String responseFileCommands, String commandLineCommands)
         at Microsoft.Build.Utilities.ToolTask.Execute()

What step should clone android-platform-support?

On windows I believe the PrepareExternal target should clone/update to the right ref, and on macos make prepare-external-git-dependencies should set up the source.

@jonathanpeppers
Copy link
Member

I think it's working for me now, -t:PrepareExternal popped up a login box:

image

Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

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

I tested locally and things seemed to be working for me.

I reran some of the lanes that failed/timed out.

@pjcollins pjcollins merged commit 22f23dd into main Nov 21, 2024
58 checks passed
@pjcollins pjcollins deleted the dev/pjc/azrepo-test branch November 21, 2024 16:30
@github-actions github-actions bot locked and limited conversation to collaborators Dec 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants