Skip to content

Fix release pipeline building packages #1358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SteveL-MSFT merged 5 commits into from
Jan 19, 2026
Merged

Fix release pipeline building packages #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
327168a
Change release builds to use new build.ps1 for builds
Jan 15, 2026
bfe8228
add debug tracing
Jan 15, 2026
37c1061
add more tracing
Jan 15, 2026
3d195b8
Fix where to get cargo targets from
Jan 16, 2026
ad86888
remove tracing
Jan 16, 2026
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
6 changes: 3 additions & 3 deletions .pipelines/DSC-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ extends:
$header = "Bearer $(AzToken)"
$env:CARGO_REGISTRIES_POWERSHELL_TOKEN = $header
$env:CARGO_REGISTRIES_POWERSHELL_CREDENTIAL_PROVIDER = 'cargo:token'
./packaging.ps1 -Release -Architecture x86_64-unknown-linux-musl
./build.ps1 -Release -Architecture x86_64-unknown-linux-musl
./packaging.ps1 -PackageType tgz -Architecture x86_64-unknown-linux-musl -Release
./packaging.ps1 -PackageType rpm -Architecture x86_64-unknown-linux-musl -Release
./packaging.ps1 -PackageType deb -Architecture x86_64-unknown-linux-musl -Release
Expand Down Expand Up @@ -388,7 +388,7 @@ extends:
$header = "Bearer $(AzToken)"
$env:CARGO_REGISTRIES_POWERSHELL_TOKEN = $header
$env:CARGO_REGISTRIES_POWERSHELL_CREDENTIAL_PROVIDER = 'cargo:token'
./packaging.ps1 -Release -Architecture aarch64-unknown-linux-musl
./build.ps1 -Release -Architecture aarch64-unknown-linux-musl
./packaging.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-musl -Release
./packaging.ps1 -PackageType rpm -Architecture aarch64-unknown-linux-musl -Release
./packaging.ps1 -PackageType deb -Architecture aarch64-unknown-linux-musl -Release
Expand Down Expand Up @@ -438,7 +438,7 @@ extends:
$env:CARGO_REGISTRIES_POWERSHELL_TOKEN = $header
$env:CARGO_REGISTRIES_POWERSHELL_CREDENTIAL_PROVIDER = 'cargo:token'
Write-Verbose -Verbose "Building for $(buildName)"
./packaging.ps1 -Release -Architecture $(buildName)
./build.ps1 -Release -Architecture $(buildName)
./packaging.ps1 -PackageType tgz -Architecture $(buildName) -Release
Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
Write-Host "##vso[artifact.upload containerfolder=release;artifactname=release]$(ob_outputDirectory)/DSC-$(PackageVersion)-$(buildName).tar.gz"
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/DSC-Windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ steps:
$env:PATH += ";$LLVMBIN"
write-verbose -verbose (gcm clang.exe | out-string)
Write-Verbose -Verbose "Building for ${{ parameters.buildName }}"
./packaging.ps1 -Release -Architecture ${{ parameters.buildName }} -SkipLinkCheck
./build.ps1 -Release -Architecture ${{ parameters.buildName }} -SkipLinkCheck -Verbose
displayName: 'Build ${{ parameters.buildName }}'
env:
ob_restore_phase: true
Expand All @@ -66,7 +66,7 @@ steps:
# workaround known issue of building in OneBranch copying from TMP folder
$null = New-Item -ItemType Directory -Path "${{ parameters.signSrcPath }}" -ErrorAction Ignore
# copy only the exes from the TMP folder since it contains intermediately built files we don't want to sign
write-host 'Binaries in $(env:CARGO_TARGET_DIR)'
write-host 'Binaries in ${env:CARGO_TARGET_DIR}'
Copy-Item -Path "$env:CARGO_TARGET_DIR/${{ parameters.buildName }}/${{ parameters.BuildConfiguration }}/*.exe" -Destination "${{ parameters.signSrcPath }}" -Verbose
Copy-Item -Path "$(Build.SourcesDirectory)/DSC/bin/${{ parameters.buildName }}/${{ parameters.BuildConfiguration }}/*" -Recurse -Destination "${{ parameters.signSrcPath }}" -Verbose -Force
write-host 'Binaries in ${{ parameters.signSrcPath }}'
Expand Down
4 changes: 2 additions & 2 deletions build.helpers.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,15 +1021,15 @@ function Get-ArtifactDirectoryPath {
return [DscArtifactDirectoryPath]@{
BinRoot = Join-Path $PSScriptRoot 'bin'
Bin = Join-Path $PSScriptRoot 'bin' $configuration
RustTarget = Join-Path $PSScriptRoot 'target' $configuration
RustTarget = $env:CARGO_TARGET_DIR ?? (Join-Path $PSScriptRoot 'target' $configuration)
MsixBundle = Join-Path $PSScriptRoot 'bin' 'msix'
}
}

[DscArtifactDirectoryPath]@{
BinRoot = Join-Path $PSScriptRoot 'bin'
Bin = Join-Path $PSScriptRoot 'bin' $Architecture $configuration
RustTarget = Join-Path $PSScriptRoot 'target' $Architecture $configuration
RustTarget = $env:CARGO_TARGET_DIR ?? (Join-Path $PSScriptRoot 'target' $Architecture $configuration)
MsixBundle = Join-Path $PSScriptRoot 'bin' 'msix'
MsixTarget = Join-Path $PSScriptRoot 'bin' $Architecture 'msix'
ZipTarget = Join-Path $PSScriptRoot 'bin' $Architecture 'zip'
Expand Down
2 changes: 1 addition & 1 deletion packaging.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ if (!$SkipBuild) {
New-Item -ItemType Directory $target -ErrorAction Ignore > $null

# make sure dependencies are built first so clippy runs correctly
$windows_projects = @("lib/dsc-lib-pal", "lib/dsc-lib-registry", "resources/registry", "resources/reboot_pending", "adapters/wmi", "configurations/windows", 'extensions/appx')
$windows_projects = @("lib/dsc-lib-pal", "lib/dsc-lib-registry", "resources/registry", "resources/reboot_pending", "resources/WindowsUpdate","adapters/wmi", "configurations/windows", 'extensions/appx')
$macOS_projects = @("resources/brew")
$linux_projects = @("resources/apt")

Expand Down