Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions .github/workflows/base-installer-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,25 +152,16 @@ jobs:
echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
if: github.event_name != 'pull_request'

- name: Build and test
id: build_and_test
- name: Build and run tests
shell: powershell
run: |
.\build.ps1 -BuildInstaller -Configuration Release -Verbosity detailed -BuildTests -RunTests -TestFilter 'TestCategory!=DesktopRequired' -MsBuildArgs @("/bl") | Tee-Object -FilePath build.log
.\test.ps1 -Configuration Release -Verbosity detailed -TestFilter 'TestCategory!=DesktopRequired' | Tee-Object -FilePath test.log
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

- name: Scan Build Output
- name: Build installer
shell: powershell
run: |
$results = Select-String -Path "build.log" -Pattern "^\s*[1-9][0-9]* Error\(s\)"
if ($results) {
foreach ($result in $results) {
Write-Host "Found errors in build.log $($result.LineNumber): $($result.Line)" -ForegroundColor red
}
exit 1
} else {
Write-Host "No errors found" -ForegroundColor green
exit 0
}
.\build.ps1 -BuildInstaller -Configuration Release -Verbosity detailed -MsBuildArgs @("/bl") | Tee-Object -FilePath build.log

- name: Move installers to staging folder
id: stage_installers
Expand Down
20 changes: 5 additions & 15 deletions .github/workflows/patch-installer-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,26 +220,16 @@ jobs:
New-ItemProperty -Path $path -Name $valueName -Value $expectedValue -Type String -Force
}

- name: Build and test
id: build_and_test
- name: Build and run tests
shell: powershell
run: |
Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\.NETFramework\AppContext"
.\build.ps1 -BuildPatch -Configuration Release -Verbosity detailed -BuildTests -RunTests -TestFilter 'TestCategory!=DesktopRequired' -MsBuildArgs @("/bl") | Tee-Object -FilePath build.log
.\test.ps1 -Configuration Release -Verbosity detailed -TestFilter 'TestCategory!=DesktopRequired' | Tee-Object -FilePath test.log
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

- name: Scan Build Output
- name: Build patch installer
shell: powershell
run: |
$results = Select-String -Path "build.log" -Pattern "^\s*[1-9][0-9]* Error\(s\)"
if ($results) {
foreach ($result in $results) {
Write-Host "Found errors in build.log $($result.LineNumber): $($result.Line)" -ForegroundColor red
}
exit 1
} else {
Write-Host "No errors found" -ForegroundColor green
exit 0
}
.\build.ps1 -BuildPatch -Configuration Release -Verbosity detailed -MsBuildArgs @("/bl") | Tee-Object -FilePath build.log

- name: Find patch installer
id: find_patch
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ _user.mak.lnx
*.usertasks
*.resources
*.bak
*.fwdata.lock
*.swp
*.pyc
*.log
Expand Down
6 changes: 4 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ if ($Configuration -eq 'Release' -and -not $isGitHubActions) {
}
}

# ===========ed Module
# =============================================================================
# Import FwBuildHelpers Module (for building build tasks)
# =============================================================================

$helpersPath = Join-Path $PSScriptRoot "Build/Agent/FwBuildHelpers.psm1"
Expand Down Expand Up @@ -384,6 +385,7 @@ try {
$finalMsBuildArgs += "/p:BuildNativeTests=true"
}

# REVIEW (Hasso) 2026.03: do we want to build additional apps for the installer? (moot, because the installer shouldn't be rebuilding stuff)
if ($BuildAdditionalApps) {
$finalMsBuildArgs += "/p:BuildAdditionalApps=true"
}
Expand Down Expand Up @@ -596,7 +598,7 @@ try {
Invoke-MSBuild `
-Arguments (@('Build/InstallerBuild.proj', "/t:Build$BaseOrPatch", '/p:config=release', "/p:InstallerToolset=$InstallerToolset", $installerCleanArg) + `
$InstallerMsBuildArgs) `
-Description '$BaseOrPatch Build' `
-Description "$BaseOrPatch Build" `
-LogPath $LogFile `
-TailLines $TailLines

Expand Down
Loading