From 7262f74f7f491a728a1528f4612b1e4e49878c60 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 21 Sep 2026 09:17:22 -0400 Subject: [PATCH] Enable versions in publish script --- publish-nix.sh | 33 ++++++++++++++++++++++++++++----- publish-win.ps1 | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/publish-nix.sh b/publish-nix.sh index a53062e7..94a7f1a7 100755 --- a/publish-nix.sh +++ b/publish-nix.sh @@ -14,7 +14,9 @@ INCLUDE_DEBUG=false INCLUDE_UNPUBLISHED=false NO_BUILD=false NO_ARCHIVE=false -while getopts "udpba" OPTION; do +HAS_VERSION=false +VERSION="NONE" +while getopts "udpbav:" OPTION; do case $OPTION in u) USE_ALL=true @@ -31,6 +33,10 @@ while getopts "udpba" OPTION; do a) NO_ARCHIVE=true ;; + v) + HAS_VERSION=true + VERSION=${OPTARG} + ;; *) echo "Invalid option provided" exit 1 @@ -51,6 +57,7 @@ echo " Include debug builds (-d) $INCLUDE_DEBUG" echo " Include unpublished packages (-p) $INCLUDE_UNPUBLISHED" echo " No build (-b) $NO_BUILD" echo " No archive (-a) $NO_ARCHIVE" +echo " Version (-v) $HAS_VERSION ($VERSION)" echo " " # Create the build matrix arrays @@ -198,10 +205,18 @@ if [ $NO_ARCHIVE = false ]; then # Only include Debug if set if [ $INCLUDE_DEBUG = true ]; then cd $BUILD_FOLDER/ExtractionTool/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/ - zip -r $BUILD_FOLDER/ExtractionTool_${FRAMEWORK}_${RUNTIME}_debug.zip . + if [ $HAS_VERSION = true ]; then + zip -r $BUILD_FOLDER/ExtractionTool_${VERSION}_${FRAMEWORK}_${RUNTIME}_debug.zip . + else + zip -r $BUILD_FOLDER/ExtractionTool_${FRAMEWORK}_${RUNTIME}_debug.zip . + fi fi cd $BUILD_FOLDER/ExtractionTool/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/ - zip -r $BUILD_FOLDER/ExtractionTool_${FRAMEWORK}_${RUNTIME}_release.zip . + if [ $HAS_VERSION = true ]; then + zip -r $BUILD_FOLDER/ExtractionTool_${VERSION}_${FRAMEWORK}_${RUNTIME}_release.zip . + else + zip -r $BUILD_FOLDER/ExtractionTool_${FRAMEWORK}_${RUNTIME}_release.zip . + fi done done @@ -230,10 +245,18 @@ if [ $NO_ARCHIVE = false ]; then # Only include Debug if set if [ $INCLUDE_DEBUG = true ]; then cd $BUILD_FOLDER/InfoPrint/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/ - zip -r $BUILD_FOLDER/InfoPrint_${FRAMEWORK}_${RUNTIME}_debug.zip . + if [ $HAS_VERSION = true ]; then + zip -r $BUILD_FOLDER/InfoPrint_${VERSION}_${FRAMEWORK}_${RUNTIME}_debug.zip . + else + zip -r $BUILD_FOLDER/InfoPrint_${FRAMEWORK}_${RUNTIME}_debug.zip . + fi fi cd $BUILD_FOLDER/InfoPrint/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/ - zip -r $BUILD_FOLDER/InfoPrint_${FRAMEWORK}_${RUNTIME}_release.zip . + if [ $HAS_VERSION = true ]; then + zip -r $BUILD_FOLDER/InfoPrint_${VERSION}_${FRAMEWORK}_${RUNTIME}_release.zip . + else + zip -r $BUILD_FOLDER/InfoPrint_${FRAMEWORK}_${RUNTIME}_release.zip . + fi done done diff --git a/publish-win.ps1 b/publish-win.ps1 index 2a869e1a..ab074800 100644 --- a/publish-win.ps1 +++ b/publish-win.ps1 @@ -26,7 +26,11 @@ param( [Parameter(Mandatory = $false)] [Alias("NoArchive")] - [switch]$NO_ARCHIVE + [switch]$NO_ARCHIVE, + + [Parameter(Mandatory = $false, ValueFromPipeline = $true)] + [Alias("BuildVersion")] + [string]$BUILD_VERSION ) # Set the current directory as a variable @@ -42,6 +46,7 @@ Write-Host " Include debug builds (-IncludeDebug) $INCLUDE_DEBUG Write-Host " Include unpublished packages (-IncludeUnpublished) $INCLUDE_DEBUG" Write-Host " No build (-NoBuild) $NO_BUILD" Write-Host " No archive (-NoArchive) $NO_ARCHIVE" +Write-Host " Version (-BuildVersion) $BUILD_VERSION" Write-Host " " # Create the build matrix arrays @@ -179,11 +184,21 @@ if (!$NO_ARCHIVE.IsPresent) { # Only include Debug if set if ($INCLUDE_DEBUG.IsPresent) { Set-Location -Path $BUILD_FOLDER\ExtractionTool\bin\Debug\${FRAMEWORK}\${RUNTIME}\publish\ - 7z a -tzip $BUILD_FOLDER\ExtractionTool_${FRAMEWORK}_${RUNTIME}_debug.zip * + if ($BUILD_VERSION -ne $null) { + 7z a -tzip $BUILD_FOLDER\ExtractionTool_${BUILD_VERSION}_${FRAMEWORK}_${RUNTIME}_debug.zip * + } + else { + 7z a -tzip $BUILD_FOLDER\ExtractionTool_${FRAMEWORK}_${RUNTIME}_debug.zip * + } } Set-Location -Path $BUILD_FOLDER\ExtractionTool\bin\Release\${FRAMEWORK}\${RUNTIME}\publish\ - 7z a -tzip $BUILD_FOLDER\ExtractionTool_${FRAMEWORK}_${RUNTIME}_release.zip * + if ($BUILD_VERSION -ne $null) { + 7z a -tzip $BUILD_FOLDER\ExtractionTool_${BUILD_VERSION}_${FRAMEWORK}_${RUNTIME}_release.zip * + } + else { + 7z a -tzip $BUILD_FOLDER\ExtractionTool_${FRAMEWORK}_${RUNTIME}_release.zip * + } } } @@ -208,11 +223,21 @@ if (!$NO_ARCHIVE.IsPresent) { # Only include Debug if set if ($INCLUDE_DEBUG.IsPresent) { Set-Location -Path $BUILD_FOLDER\InfoPrint\bin\Debug\${FRAMEWORK}\${RUNTIME}\publish\ - 7z a -tzip $BUILD_FOLDER\InfoPrint_${FRAMEWORK}_${RUNTIME}_debug.zip * + if ($BUILD_VERSION -ne $null) { + 7z a -tzip $BUILD_FOLDER\InfoPrint_${BUILD_VERSION}_${FRAMEWORK}_${RUNTIME}_debug.zip * + } + else { + 7z a -tzip $BUILD_FOLDER\InfoPrint_${FRAMEWORK}_${RUNTIME}_debug.zip * + } } Set-Location -Path $BUILD_FOLDER\InfoPrint\bin\Release\${FRAMEWORK}\${RUNTIME}\publish\ - 7z a -tzip $BUILD_FOLDER\InfoPrint_${FRAMEWORK}_${RUNTIME}_release.zip * + if ($BUILD_VERSION -ne $null) { + 7z a -tzip $BUILD_FOLDER\InfoPrint_${BUILD_VERSION}_${FRAMEWORK}_${RUNTIME}_release.zip * + } + else { + 7z a -tzip $BUILD_FOLDER\InfoPrint_${FRAMEWORK}_${RUNTIME}_release.zip * + } } }