Skip to content
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

Jump to bottom

(GH-579) include compiled modules in Boxstarter.zip #580

Merged
merged 3 commits into from
Sep 27, 2024
Merged

(GH-579) include compiled modules in Boxstarter.zip #580

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a63046b
GH-579: include compiled modules in Boxstarter.zip
mwallner Sep 16, 2024
5db7141
(maint) typo in buildscript - tag is not recognized
mwallner Sep 17, 2024
91f2fd3
GH-579: ensure Boxstarter.zip is included in nupkg
mwallner Sep 26, 2024
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
33 changes: 22 additions & 11 deletions BuildScripts/default.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Properties {

$tagName = git tag -l --points-at HEAD

$script:isTagges = if ($tagName) {
$script:isTagged = if ($tagName) {
Write-Host "Found tag ${'$'}tagName"
$true
}
Expand Down Expand Up @@ -112,7 +112,7 @@ Task Run-GitVersion {
Write-Host "##teamcity[buildNumber '$packageVersion']"
}

Task Create-ModuleZipForRemoting {
Task Create-ModuleZipForRemoting -depends Compile-Modules, Get-ChocolateyNugetPkg {
if (Test-Path "$baseDir/Boxstarter.Chocolatey/Boxstarter.zip") {
Remove-Item "$baseDir/Boxstarter.Chocolatey/Boxstarter.zip" -Recurse -Force -ErrorAction SilentlyContinue
}
Expand All @@ -121,17 +121,19 @@ Task Create-ModuleZipForRemoting {
}
Remove-Item "$env:temp/Boxstarter.zip" -Force -ErrorAction SilentlyContinue
$boxstarterZip = "$baseDir/buildArtifacts/Boxstarter.zip"
."$7z" a -tzip "$boxstarterZip" "$baseDir/Boxstarter.Common" | Out-Null
."$7z" a -tzip "$boxstarterZip" "$baseDir/Boxstarter.WinConfig" | Out-Null
."$7z" a -tzip "$boxstarterZip" "$baseDir/Boxstarter.Bootstrapper" | Out-Null
."$7z" a -tzip "$boxstarterZip" "$baseDir/Boxstarter.Chocolatey" | Out-Null

@('Common', 'WinConfig', 'Bootstrapper', 'Chocolatey') | ForEach-Object {
."$7z" a -tzip "$boxstarterZip" "$baseDir/buildArtifacts/tempNuGetFolders/Boxstarter.$_" | Out-Null
}

."$7z" a -tzip "$boxstarterZip" "$baseDir/Boxstarter.config" | Out-Null
."$7z" a -tzip "$boxstarterZip" "$baseDir/LICENSE.txt" | Out-Null
."$7z" a -tzip "$boxstarterZip" "$baseDir/NOTICE.txt" | Out-Null
if ($taskList -eq 'test') {
."$7z" a -tzip $boxstarterZip "$basedir/Chocolatey" | Out-Null
}
Move-Item "$basedir/buildArtifacts/Boxstarter.zip" "$basedir/Boxstarter.Chocolatey/Boxstarter.zip"
Copy-Item $boxstarterZip "$baseDir/buildArtifacts/tempNuGetFolders/Boxstarter.Chocolatey/"
Move-Item $boxstarterZip "$basedir/Boxstarter.Chocolatey/Boxstarter.zip"
}

Task Build-ClickOnce -depends Install-MSBuild, Install-Win8SDK, Restore-NuGetPackages -precondition { Test-IsReleaseBuildOS } {
Expand All @@ -148,7 +150,7 @@ Task Publish-ClickOnce -depends Install-MSBuild {
Copy-Item "$basedir/Boxstarter.Clickonce/bin/Debug/App.Publish/*" "$basedir/web/Launch" -Recurse -Force
}

Task Test -depends Get-ChocolateyNugetPkg, Pack-Chocolatey, Create-ModuleZipForRemoting {
Task Test -depends Get-ChocolateyNugetPkg, Pack-Chocolatey {
Push-Location "$baseDir"
$pesterDir = "$env:ChocolateyInstall/lib/Pester"
$pesterTestResultsFile = "$baseDir/buildArtifacts/TestResults.xml"
Expand Down Expand Up @@ -208,9 +210,17 @@ Task Clean-Artifacts {
foreach ($mod in $boxstarterModules) {
New-Item -ItemType Directory "$baseDir/buildArtifacts/tempNuGetFolders/Boxstarter.$mod" | Out-Null
}

if (Test-Path "$baseDir/Boxstarter.Chocolatey/Boxstarter.zip") {
Remove-Item "$baseDir/Boxstarter.Chocolatey/Boxstarter.zip" -Recurse -Force
}

if (Test-Path "$baseDir/Boxstarter.Chocolatey/chocolatey") {
Remove-Item "$baseDir/Boxstarter.Chocolatey/chocolatey" -Recurse -Force
}
}

Task Pack-Chocolatey -depends Compile-Modules, Sign-PowerShellFiles -description 'Packs the modules and example packages' {
Task Pack-Chocolatey -depends Compile-Modules, Sign-PowerShellFiles, Create-ModuleZipForRemoting -description 'Packs the modules and example packages' {
if (Test-Path "$baseDir/BuildPackages/*.nupkg") {
Remove-Item "$baseDir/BuildPackages/*.nupkg" -Force
}
Expand Down Expand Up @@ -247,11 +257,12 @@ Task Restore-NuGetPackages -precondition { Test-IsReleaseBuildOS } {
}

Task Get-ChocolateyNugetPkg {
New-Item -ItemType Directory $basedir/Boxstarter.Chocolatey/chocolatey -ErrorAction SilentlyContinue | Out-Null
$chocoNupkgDir = "$basedir/Boxstarter.Chocolatey/chocolatey"
New-Item -ItemType Directory $chocoNupkgDir -ErrorAction SilentlyContinue | Out-Null
$chocoVersion = '1.1.0'
$srcUrl = "https://community.chocolatey.org/api/v2/package/chocolatey/$chocoVersion"
$targetFile = "chocolatey.$chocoVersion.nupkg"
Push-Location $basedir/Boxstarter.Chocolatey/chocolatey
Push-Location $chocoNupkgDir
try {
if (-Not (Test-Path $targetFile)) {
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Expand Down