Skip to content

Commit 280f2a0

Browse files
authored
[PERF] Update Android App Maui rollback generation (#105763)
Move Maui workload installation until after we have performance installed so we have versions available, and use the performance repos versions and python files to generate the rollback.json.
1 parent 1337553 commit 280f2a0

File tree

1 file changed

+25
-16
lines changed

1 file changed

+25
-16
lines changed

eng/pipelines/coreclr/templates/build-perf-bdn-app.yml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ parameters:
1717
archiveType: ''
1818
tarCompression: ''
1919
framework: 'net9.0' # Framework version to get versions for and build for
20-
perfRepo: 'main' # Perf repo to pull for the PerfLabExporter
20+
perfBranch: 'main' # Performance branch to use for cloning
2121

2222

2323
steps:
@@ -57,20 +57,6 @@ steps:
5757
overwriteExistingFiles: true
5858
cleanDestinationFolder: false
5959

60-
- script: |
61-
echo '{ }' > ./global.json
62-
curl -o NuGet.config 'https://raw.githubusercontent.com/dotnet/maui/${{parameters.framework}}/NuGet.config'
63-
curl -o dotnet-install.sh 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh'
64-
curl -Lo maui-supported-sdk-version.json 'https://maui.blob.core.windows.net/metadata/sdks/${{parameters.framework}}.json'
65-
version=$(sed -nr 's/\s*"version": "(.*)"/\1/p' ./maui-supported-sdk-version.json)
66-
chmod -R a+rx .
67-
./dotnet-install.sh --version $version --install-dir .
68-
./dotnet --info
69-
./dotnet workload install maui --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/${{parameters.framework}}.json --configfile NuGet.config
70-
./dotnet workload install android --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/${{parameters.framework}}.json --configfile NuGet.config
71-
displayName: Install MAUI workload
72-
workingDirectory: $(Build.SourcesDirectory)
73-
7460
- script: $(Build.SourcesDirectory)/eng/testing/performance/create-provisioning-profile.sh
7561
displayName: Create iOS code signing and provisioning profile
7662

@@ -84,10 +70,33 @@ steps:
8470
- script: |
8571
set -x
8672
pwd
87-
git clone https://github.com/dotnet/performance.git --depth 1 -b ${{parameters.perfRepo}} --single-branch
73+
git clone https://github.com/dotnet/performance.git --depth 1 -b ${{parameters.perfBranch}} --single-branch
8874
displayName: Clone performance
8975
workingDirectory: $(Build.SourcesDirectory)
9076
77+
- script: |
78+
pwd
79+
echo '$(Build.SourcesDirectory)/rollback.json'
80+
export PYTHONPATH=$PYTHONPATH:$(Build.SourcesDirectory)/performance/scripts:$(Build.SourcesDirectory)/performance/src/scenarios
81+
python -c "import mauisharedpython; roll_dict = mauisharedpython.generate_maui_rollback_dict(); mauisharedpython.dump_dict_to_json_file(roll_dict, '$(Build.SourcesDirectory)/rollback.json')"
82+
displayName: Generate rollback.json
83+
workingDirectory: $(Build.SourcesDirectory)/performance/src/scenarios/shared
84+
85+
- script: |
86+
echo '{ }' > ./global.json
87+
curl -o NuGet.config 'https://raw.githubusercontent.com/dotnet/maui/${{parameters.framework}}/NuGet.config'
88+
curl -o dotnet-install.sh 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh'
89+
curl -Lo performance-version-details.xml 'https://raw.githubusercontent.com/dotnet/performance/${{parameters.perfBranch}}/eng/Version.Details.xml'
90+
version=$(sed -nr 's/[[:space:]]*<Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="(.*)"[[:space:]].*/\1/p' ./performance-version-details.xml)
91+
echo dotnet-version: $version
92+
chmod -R a+rx .
93+
./dotnet-install.sh --version $version --install-dir .
94+
./dotnet --info
95+
./dotnet workload install maui --from-rollback-file rollback.json --configfile NuGet.config
96+
./dotnet workload install android --from-rollback-file rollback.json --configfile NuGet.config
97+
displayName: Install MAUI workload
98+
workingDirectory: $(Build.SourcesDirectory)
99+
91100
- pwsh: |
92101
$BenchmarkDotNetVersionCapture = Get-Content .\performance\eng\Versions.props | Select-String -Pattern '<BenchmarkDotNetVersion>(.+?)</BenchmarkDotNetVersion>'
93102
if ($BenchmarkDotNetVersionCapture.Length -eq 0) {

0 commit comments

Comments
 (0)