Skip to content

(MAINT) Fix packaging for zip and tgz #1323

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 1 commit into from
Dec 16, 2025
Merged

(MAINT) Fix packaging for zip and tgz #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions build.data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,10 @@
"IsRust": true
},
{
"Name": "dsc-lib-jsonschema-macros",
"Kind": "Library",
"RelativePath": "lib/dsc-lib-jsonschema-macros",
"IsRust": true
"Name": "dsc-lib-jsonschema-macros",
"Kind": "Library",
"RelativePath": "lib/dsc-lib-jsonschema-macros",
"IsRust": true
},
{
"Name": "dsc-lib-osinfo",
Expand Down
11 changes: 7 additions & 4 deletions build.helpers.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,10 @@ function Import-DscBuildData {
| ConvertFrom-Json -AsHashtable

if ($RefreshProjects) {
$data.Projects = Get-DscProjectData
[DscProjectDefinition[]]$rootProject = $data.Projects.Where({
$_.Name -eq 'root'
}, 'first')[0]
$data.Projects = $rootProject + (Get-DscProjectData)
} else {
$data.Projects = [DscProjectDefinition[]]$data.Projects
}
Expand Down Expand Up @@ -1030,7 +1033,7 @@ function Get-ArtifactDirectoryPath {
MsixBundle = Join-Path $PSScriptRoot 'bin' 'msix'
MsixTarget = Join-Path $PSScriptRoot 'bin' $Architecture 'msix'
ZipTarget = Join-Path $PSScriptRoot 'bin' $Architecture 'zip'
$TgzTarget = Join-Path $PSScriptRoot 'bin' $Architecture 'tgz'
TgzTarget = Join-Path $PSScriptRoot 'bin' $Architecture 'tgz'
}
}
}
Expand Down Expand Up @@ -1333,7 +1336,7 @@ function Build-RustProject {
} elseif ($Architecture -match 'darwin') {
'macOS'
} elseif ($Architecture -match 'windows') {
'windows'
'Windows'
} else {
throw "Unsupported architecture '$Architecture'"
}
Expand Down Expand Up @@ -2072,7 +2075,7 @@ function Build-DscPackage {
} elseif ($packageType -eq 'tgz') {
Build-DscTgzPackage @buildParams
} elseif ($packageType -eq 'zip') {
Build-DscTgzPackage
Build-DscZipPackage @buildParams
} else {
throw "Unhandled package type '$packageType'"
}
Expand Down
8 changes: 6 additions & 2 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,11 @@ process {
clean {
$progressParams.Activity = 'Cleaning up'
Write-BuildProgress @progressParams
Write-BuildProgress @progressParams -Status "Restoring rust environment"
Reset-RustEnvironment -PriorEnvironment $priorRustEnvironment @VerboseParam

if ($null -ne $priorRustEnvironment) {
Write-BuildProgress @progressParams -Status "Restoring rust environment"
Reset-RustEnvironment -PriorEnvironment $priorRustEnvironment @VerboseParam
}

Write-BuildProgress -Completed
}