Skip to content

Commit fdd9ffa

Browse files
pjcollinsjonpryor
authored andcommitted
[ci] Remove nested xamarin-android submodule (#4091)
Context: #4089 Context: ed29bf1 In commit ed29bf1 we migrated to a new Azure Pipelines feature that allows us to clone external sources. This caused an issue with our inverted build, as it introduced a nested xamarin-android checkout which was previously ignored. When attempting to apply ed29bf1 to d16-4 -- see also PR #4089 -- our build failed due to an attempt to restore NuGet packages which are only present (with a proper feed configuration) in xamarin-android/master: Restore failed in 483.85 ms for /Users/runner/runners/2.162.0/work/1/s/xamarin-android/external/monodroid/external/xamarin-android/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj. Committing restore... Errors in /Users/runner/runners/2.162.0/work/1/s/xamarin-android/external/monodroid/external/xamarin-android/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj NU1101: Unable to find package Microsoft.DotNet.GenAPI. No packages exist with this id in source(s): nuget.org NU1101: Unable to find package Microsoft.DotNet.ApiCompat. No packages exist with this id in source(s): nuget.org Errors in /Users/runner/runners/2.162.0/work/1/s/xamarin-android/external/monodroid/external/xamarin-android/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj NU1101: Unable to find package XliffTasks. No packages exist with this id in source(s): nuget.org Rather than ensuring this submodule is checked out to the right commit, we'll just nuke the entire nested submodule instead as it is not needed and should not be used by the inverted build system.
1 parent 84dc3f3 commit fdd9ffa

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,19 @@ stages:
100100
workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
101101
displayName: make prepare-update-mono
102102

103+
# Clone monodroid wth submodules, but disregard the unused xamarin-android submodule.
103104
- checkout: monodroid
104105
clean: true
105106
submodules: recursive
106107
path: s/xamarin-android/external/monodroid
107108
persistCredentials: true
108109
condition: and(succeeded(), eq(variables['XA.Commercial.Build'], 'true'))
109110

111+
- script: rm -rf external/monodroid/external/xamarin-android
112+
workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
113+
displayName: delete legacy xamarin-android submodule
114+
condition: and(succeeded(), eq(variables['XA.Commercial.Build'], 'true'))
115+
110116
- script: make prepare-external-git-dependencies PREPARE_CI=1 CONFIGURATION=$(XA.Build.Configuration)
111117
workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
112118
displayName: make prepare-external-git-dependencies

0 commit comments

Comments
 (0)