From 9fc53bb4b341ee885f5dd912866b17b8bb4b3427 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 14 Jan 2022 14:08:42 -0600 Subject: [PATCH] [build] .yaml changes for private fork & NuGet feeds (#6594) This brings over changes from `xamarin-android-private`. With these changes, the private fork should be able to build `main` and push builds to an internal feed. --- build-tools/automation/azure-pipelines.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 1b94eb58b9f..936e4167cba 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -44,12 +44,20 @@ variables: value: $[or(eq(variables['XA.RunAllTests'], true), eq(variables['IsMonoBranch'], true))] - name: DotNetNUnitCategories value: '& TestCategory != DotNetIgnore & TestCategory != HybridAOT & TestCategory != ProfiledAOT & TestCategory != MkBundle & TestCategory != MonoSymbolicate & TestCategory != PackagesConfig & TestCategory != StaticProject & TestCategory != Debugger & TestCategory != SystemApplication' -- ${{ if and(eq(variables['Build.DefinitionName'], 'Xamarin.Android'), ne(variables['Build.Reason'], 'PullRequest')) }}: +- ${{ if eq(variables['Build.DefinitionName'], 'Xamarin.Android-Private') }}: + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-MSRC-Storage + - name: DotNetFeedCredential + value: dotnet6-internal-dnceng-internal-feed +- ${{ if ne(variables['Build.DefinitionName'], 'Xamarin.Android-Private') }}: + - name: DotNetFeedCredential + value: dnceng-dotnet6 +- ${{ if and(or(eq(variables['Build.DefinitionName'], 'Xamarin.Android'), eq(variables['Build.DefinitionName'], 'Xamarin.Android-Private')), ne(variables['Build.Reason'], 'PullRequest')) }}: - name: MicroBuildSignType value: Real - name: VSEngMacBuildPool value: VSEng-Xamarin-RedmondMac-Android-Trusted -- ${{ if or(ne(variables['Build.DefinitionName'], 'Xamarin.Android'), eq(variables['Build.Reason'], 'PullRequest')) }}: +- ${{ if or(and(ne(variables['Build.DefinitionName'],'Xamarin.Android'), ne(variables['Build.DefinitionName'], 'Xamarin.Android-Private')), eq(variables['Build.Reason'], 'PullRequest')) }}: - name: MicroBuildSignType value: Test - name: VSEngMacBuildPool @@ -1282,7 +1290,7 @@ stages: command: push packagesToPush: $(System.DefaultWorkingDirectory)\nuget-signed\*.nupkg nuGetFeedType: external - publishFeedCredentials: dnceng-dotnet6 + publishFeedCredentials: $(DotNetFeedCredential) condition: and(succeeded(), eq(variables['PushXAPackages'], 'true')) - task: DownloadPipelineArtifact@2 @@ -1296,7 +1304,7 @@ stages: command: push packagesToPush: $(System.DefaultWorkingDirectory)\vs-msi-nugets\*.nupkg nuGetFeedType: external - publishFeedCredentials: dnceng-dotnet6 + publishFeedCredentials: $(DotNetFeedCredential) condition: and(succeeded(), eq(variables['PushXAPackages'], 'true')) - powershell: >-