Skip to content

Commit

Permalink
Merge pull request #2922 from unoplatform/dev/jela/x-a-javac-log
Browse files Browse the repository at this point in the history
Split the build in more phases to reduce build server memory pressure
  • Loading branch information
jeromelaban authored Apr 8, 2020
2 parents 9a05b80 + 5a5bc8d commit 4ff5896
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 3,450 deletions.
4 changes: 4 additions & 0 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ jobs:
parameters:
vmImage: '$(windowsVMImage)'

- template: build/ci/.azure-devops-uap.yml
parameters:
vmImage: '$(windowsVMImage)'

- template: build/ci/.azure-devops-unit-tests.yml
parameters:
vmImage: '$(windowsVMImage)'
Expand Down
40 changes: 40 additions & 0 deletions build/PackageDiffIgnore.xml
Original file line number Diff line number Diff line change
Expand Up @@ -704,5 +704,45 @@
reason="Style removed from monoandroid (xamarin:Style with only ios:Setter)" />
</Properties>
</IgnoreSet>

<IgnoreSet baseVersion="2.1.37">
<Methods>
<Member
fullName="System.Void Windows.UI.Xaml.Controls.DatePickerSelectedValueChangedEventArgs..ctor()"
reason="Not part of the WinUI API." />
<Member
fullName="System.Void Windows.UI.Xaml.Controls.DatePickerValueChangedEventArgs..ctor(System.DateTimeOffset newDate, System.DateTimeOffset oldDate)"
reason="Not part of the WinUI API." />
<Member
fullName="System.Boolean Windows.UI.Xaml.Controls.TextBox.FocusTextView()"
reason="Not part of the WinUI API, Uno-specific implementation detail." />
<Member
fullName="System.Void Windows.UI.Xaml.Controls.Control.OnFocusStateChanged(Windows.UI.Xaml.FocusState oldValue, Windows.UI.Xaml.FocusState newValue)"
reason="Not part of the WinUI API, Uno-specific implementation detail." />
<Member
fullName="Windows.UI.Xaml.Style Uno.UI.GlobalStaticResources.get___ImplicitStyle_Windows_UI_Xaml_Controls_DatePickerSelector()"
reason="Style removed from monoandroid (xamarin:Style with only ios:Setter)" />

<Member
fullName="System.Void Windows.UI.Xaml.Controls.Primitives.DragCompletedEventArgs..ctor(System.Object originalSource, System.Double horizontalChange, System.Double verticalChange, System.Boolean canceled)"
reason="Updated internal signature"/>

<Member
fullName="System.Void Windows.Devices.Sensors.PedometerReadingChangedEventArgs..ctor()"
reason="Parameter-less ctor does not exist in UWP"/>
<Member
fullName="System.Void Windows.Devices.Sensors.Pedometer..ctor()"
reason="Parameter-less ctor does not exist in UWP"/>
<Member
fullName="System.Void Windows.Devices.Sensors.PedometerReading..ctor()"
reason="Parameter-less ctor does not exist in UWP"/>
</Methods>
<Properties>
<Member
fullName="Windows.UI.Xaml.Style Uno.UI.GlobalStaticResources::__ImplicitStyle_Windows_UI_Xaml_Controls_DatePickerSelector()"
reason="Style removed from monoandroid (xamarin:Style with only ios:Setter)" />
</Properties>
</IgnoreSet>

</IgnoreSets>
</DiffIgnore>
10 changes: 2 additions & 8 deletions build/Uno.UI.Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,11 @@
<Target Name="BuildCI">
<Exec Command="npm i" WorkingDirectory="..\src\SamplesApp\SamplesApp.Wasm.UITests" />

<MSBuild Properties="Configuration=Release;CopyDSYM=False;UnoSampleAppDisableAPKGeneration=True;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest;PackageVersion=$(GITVERSION_FullSemVer)"
<MSBuild Properties="Configuration=Release_NoSamples;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest;PackageVersion=$(GITVERSION_FullSemVer)"
Projects="..\src\Uno.UI.sln"
Targets="Restore;Build"
RebaseOutputs="false"
BuildInParallel="true" />

</Target>

<Target Name="BuildCImacOS">

<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true" Projects="..\src\Uno.UI-vs4mac.sln" Targets="Restore;Build" RebaseOutputs="false" BuildInParallel="true" />
BuildInParallel="false" />

</Target>

Expand Down
50 changes: 50 additions & 0 deletions build/ci/.azure-devops-uap.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
parameters:
vmImage: ''

jobs:
- job: UAP_Build

pool:
vmImage: ${{ parameters.vmImage }}

variables:
CombinedConfiguration: Release|Any CPU
CI_Build: true

# This is required to be able to use hard links as much as possible
NUGET_PACKAGES: $(Agent.WorkFolder)\.nuget

steps:
- checkout: self
clean: true

- template: templates/nuget-cache.yml
parameters:
nugetPackages: $(NUGET_PACKAGES)

- template: templates/gitversion.yml

- powershell: .\build\Install-WindowsSdkISO.ps1 17763
displayName: Insider SDK

- task: MSBuild@1
inputs:
solution: src/SamplesApp/SamplesApp.UWP/SamplesApp.UWP.csproj
msbuildLocationMethod: version
msbuildVersion: latest
msbuildArchitecture: x86
msbuildArguments: /r /p:Configuration=Release /detailedsummary /bl:$(build.artifactstagingdirectory)/build-uap.binlog
clean: false
restoreNugetPackages: false
logProjectEvents: false
createLogFile: false

- task: CopyFiles@2
condition: always()
inputs:
SourceFolder: $(build.sourcesdirectory)/Build
Contents: '*.nupkg'
TargetFolder: $(build.artifactstagingdirectory)\vslatest
CleanTargetFolder: false
OverWrite: false
flattenFolders: false
12 changes: 1 addition & 11 deletions build/ci/.azure-devops-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ jobs:
msbuildLocationMethod: version
msbuildVersion: latest
msbuildArchitecture: x86
msbuildArguments: /r /p:CheckExclusions=True "/p:CombinedConfiguration=$(CombinedConfiguration)" /nodeReuse:true /detailedsummary /m # /bl:$(build.artifactstagingdirectory)\build.binlog
msbuildArguments: /r "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary # /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer).binlog
clean: false
maximumCpuCount: true
restoreNugetPackages: false
logProjectEvents: false
createLogFile: false
Expand All @@ -59,15 +58,6 @@ jobs:
OverWrite: false
flattenFolders: false

- task: CopyFiles@2
inputs:
SourceFolder: $(build.sourcesdirectory)\src\SamplesApp\SamplesApp.Wasm\bin\Release\netstandard2.0\dist
Contents: '**\*.*'
TargetFolder: $(build.artifactstagingdirectory)\sampleapp-wasm
CleanTargetFolder: false
OverWrite: false
flattenFolders: false

- task: PowerShell@2
displayName: Authenticode Sign Packages
inputs:
Expand Down
Loading

0 comments on commit 4ff5896

Please sign in to comment.