Skip to content

Commit aef2648

Browse files
committed
Move Azure Login closer to signing, and collect MSBuild binlogs
1 parent b1723ee commit aef2648

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

.github/workflows/ci-signed.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ jobs:
3333
- name: Get .NET information
3434
run: dotnet --info
3535

36+
- name: "Build target: BuildAll"
37+
run: dotnet run --project tools/builder --no-launch-profile -- BuildAll --timing
38+
3639
- name: Login to Azure CLI
3740
uses: azure/login@v2
3841
with:
3942
client-id: ${{ vars.KEYVAULT_APP_ID }}
4043
tenant-id: ${{ vars.KEYVAULT_TENANT_ID }}
4144
subscription-id: ${{ vars.KEYVAULT_SUBSCRIPTION_ID }}
4245

43-
- name: "Build target: BuildAll"
44-
run: dotnet run --project tools/builder --no-launch-profile -- BuildAll --timing
45-
4646
- name: "Build target: PublishPackages"
4747
env:
4848
PUSH_APIKEY: ${{ secrets.FEEDZ_PUSH_KEY }}
@@ -53,6 +53,14 @@ jobs:
5353
SIGN_VAULT_URI: ${{ vars.KEYVAULT_URL }}
5454
run: dotnet run --project tools/builder --no-launch-profile -- PublishPackages --timing
5555

56+
- name: "Upload artifact: build"
57+
uses: actions/upload-artifact@v4
58+
with:
59+
name: build
60+
path: artifacts/build
61+
compression-level: 9
62+
if: always()
63+
5664
- name: "Upload artifact: test"
5765
uses: actions/upload-artifact@v4
5866
with:

tools/builder/common

tools/builder/targets/Build.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.IO;
12
using System.Threading.Tasks;
23
using Xunit.BuildTools.Models;
34

@@ -9,6 +10,8 @@ public static partial async Task PerformBuild(BuildContext context)
910
{
1011
context.BuildStep("Compiling binaries");
1112

12-
await context.Exec("dotnet", $"msbuild -nologo -maxCpuCount -restore:False -verbosity:{context.Verbosity} -p:Configuration={context.ConfigurationText}");
13+
var buildLog = Path.Combine(context.BuildArtifactsFolder, "build.binlog");
14+
15+
await context.Exec("dotnet", $"msbuild -nologo -maxCpuCount -restore:False -verbosity:{context.Verbosity} -property:Configuration={context.ConfigurationText} -binaryLogger:{buildLog}");
1316
}
1417
}

0 commit comments

Comments
 (0)