From e9f513b614450ea1e9e762465e2457ee8dab5335 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 23 Sep 2024 09:45:20 -0400 Subject: [PATCH] updates for 2.4.1.0 --- Installer/build.ps1 | 55 +++++++++++++++++++++++---------- Installer/output-build-json.ps1 | 9 +++--- build-test-release.ps1 | 50 +++++++++++++++++++----------- release-streams/beta.json | 10 +++--- version | 2 +- 5 files changed, 82 insertions(+), 44 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 670e82e62..351da359e 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -1,3 +1,13 @@ +param( + [string]$version, + [string]$url = "https://github.com/openziti/desktop-edge-win/releases/download/", + [string]$stream = "beta", + [datetime]$published_at = (Get-Date -Format "yyyy-MM-ddTHH:mm:ssZ"), + [bool]$jsonOnly = $false, + [bool]$revertGitAfter = $true, + [string]$versionQualifier = "" +) + $ErrorActionPreference = "Stop" function verifyFile($path) { @@ -18,7 +28,7 @@ $ADV_INST_HOME = "C:\Program Files (x86)\Caphyon\Advanced Installer ${ADV_INST_V $SIGNTOOL="${ADV_INST_HOME}\third-party\winsdk\x64\signtool.exe" $ADVINST = "${ADV_INST_HOME}\bin\x86\AdvancedInstaller.com" $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip" -$ZITI_EDGE_TUNNEL_VERSION="v1.1.0" +$ZITI_EDGE_TUNNEL_VERSION="v1.1.4" echo "Cleaning previous build folder if it exists" Remove-Item "${buildPath}" -r -ErrorAction Ignore @@ -35,7 +45,7 @@ if($null -eq $env:ZITI_EDGE_TUNNEL_BUILD) { } echo "========================== fetching ziti-edge-tunnel ==========================" $zet_dl="https://github.com/openziti/ziti-tunnel-sdk-c/releases/download/${ZITI_EDGE_TUNNEL_VERSION}/ziti-edge-tunnel-Windows_x86_64.zip" - echo "Beginning to download ziti-edge-tunnel from ${zet_dl}" + echo "Beginning to download ziti-edge-tunnel from ${zet_dl} to ${destination}" echo "" $response = Invoke-WebRequest $zet_dl -OutFile "${destination}" } else { @@ -77,16 +87,21 @@ msbuild ZitiDesktopEdge.sln /property:Configuration=Release Pop-Location -$installerVersion=(Get-Content -Path ${checkoutRoot}\version) +if ($version -eq "") { + $version=(Get-Content -Path ${checkoutRoot}\version) +} + +echo "Building VERSION $version" + if($null -ne $env:ZITI_DESKTOP_EDGE_VERSION) { - echo "ZITI_DESKTOP_EDGE_VERSION is set. Using that: ${env:ZITI_DESKTOP_EDGE_VERSION} instead of version found in file ${installerVersion}" - $installerVersion=$env:ZITI_DESKTOP_EDGE_VERSION - echo "Version set to: ${installerVersion}" + echo "ZITI_DESKTOP_EDGE_VERSION is set. Using that: ${env:ZITI_DESKTOP_EDGE_VERSION} instead of version found in file ${version}" + $version=$env:ZITI_DESKTOP_EDGE_VERSION + echo "Version set to: ${version}" } $action = '/SetVersion' -echo "issuing $ADVINST /edit $ADVPROJECT $action $installerVersion (service version: $serviceVersion) - see https://www.advancedinstaller.com/user-guide/set-version.html" -& $ADVINST /edit $ADVPROJECT $action $installerVersion +echo "issuing $ADVINST /edit $ADVPROJECT $action $version (service version: $serviceVersion) - see https://www.advancedinstaller.com/user-guide/set-version.html" +& $ADVINST /edit $ADVPROJECT $action $version $action = '/build' echo "Assembling installer using AdvancedInstaller at: $ADVINST $action $ADVPROJECT" @@ -103,7 +118,7 @@ if($gituser -eq "ziti-ci") { } $outputPath="${scriptPath}\Output" -$exeName="Ziti Desktop Edge Client-${installerVersion}.exe" +$exeName="Ziti Desktop Edge Client-${version}.exe" $exeAbsPath="${outputPath}\${exeName}" if($null -eq $env:AWS_KEY_ID) { @@ -118,15 +133,23 @@ if($null -eq $env:OPENZITI_P12_PASS_2024) { echo "" } else { echo "adding additional signature to executable with openziti.org signing certificate" - echo "Using ${SIGNTOOL} to sign executable with the additional OpenZiti signature" + echo "Using ${SIGNTOOL} to sign executable with the additional OpenZiti signature: ${exeAbsPath}" & "$SIGNTOOL" sign /f "${scriptPath}\openziti_2024.p12" /p "${env:OPENZITI_P12_PASS_2024}" /tr http://ts.ssl.com /fd sha512 /td sha512 /as "${exeAbsPath}" } -(Get-FileHash "${exeAbsPath}").Hash > "${scriptPath}\Output\Ziti Desktop Edge Client-${installerVersion}.exe.sha256" +(Get-FileHash "${exeAbsPath}").Hash > "${scriptPath}\Output\Ziti Desktop Edge Client-${version}.exe.sha256" echo "========================== build.ps1 completed ==========================" -$defaultRootUrl = "https://github.com/openziti/desktop-edge-win/releases/download/" -$defaultStream = "beta" -$defaultPublishedAt = Get-Date -$updateJson = "${installerVersion}.json" -& .\Installer\output-build-json.ps1 -version $installerVersion -url $defaultRootUrl -stream $defaultStream -published_at $defaultPublishedAt -outputPath $updateJson +$outputPath = "${scriptPath}\Output\Ziti Desktop Edge Client-${version}.exe.json" +& .\Installer\output-build-json.ps1 -version $version -url $url -stream $stream -published_at $published_at -outputPath $outputPath -versionQualifier $versionQualifier + +echo "REMOVING .back files: ${scriptPath}\*back*" +Remove-Item "${scriptPath}\*back*" -Recurse -ErrorAction SilentlyContinue + +echo "Copying json file to beta.json" +copy $outputPath "$checkoutRoot\release-streams\beta.json" + + +if($revertGitAfter) { + git checkout DesktopEdge/Properties/AssemblyInfo.cs ZitiUpdateService/Properties/AssemblyInfo.cs Installer/ZitiDesktopEdge.aip +} diff --git a/Installer/output-build-json.ps1 b/Installer/output-build-json.ps1 index bca078a90..deb384274 100644 --- a/Installer/output-build-json.ps1 +++ b/Installer/output-build-json.ps1 @@ -5,10 +5,11 @@ param( [Parameter(Mandatory = $true)] [string]$version, - [string]$url = "http://localhost:8000/local", - [string]$stream = "beta", + [string]$url = "http://localhost:8000/release-streams/local", + [string]$stream = "local", [string]$outputPath = "${version}.json", - [datetime]$published_at + [datetime]$published_at, + [string]$versionQualifier = "" ) echo "=========== emitting a json file that represents this build ============" @@ -29,7 +30,7 @@ $jsonTemplate = @" "assets": [ { "name": "Ziti.Desktop.Edge.Client-${version}.exe", - "browser_download_url": "${url}/${version}/Ziti.Desktop.Edge.Client-${version}.exe" + "browser_download_url": "${url}/${version}${versionQualifier}/Ziti.Desktop.Edge.Client-${version}.exe" } ] } diff --git a/build-test-release.ps1 b/build-test-release.ps1 index a8a2ace31..a33b04745 100644 --- a/build-test-release.ps1 +++ b/build-test-release.ps1 @@ -8,40 +8,54 @@ param( [Parameter(Mandatory = $true)] [string]$version, - [string]$url = "http://localhost:8000/local", + [string]$url = "http://localhost:8000/release-streams/local", [string]$stream = "local", [datetime]$published_at = (Get-Date -Format "yyyy-MM-ddTHH:mm:ssZ"), [bool]$jsonOnly = $false, - [switch]$keepGitAfter + [bool]$revertGitAfter = $true, + [string]$versionQualifier = "" ) echo "" $env:ZITI_DESKTOP_EDGE_DOWNLOAD_URL="$url" $env:ZITI_DESKTOP_EDGE_VERSION="$version" $scriptDirectory = Split-Path -Path $MyInvocation.MyCommand.Path -Parent +$outputPath = "$scriptDirectory\release-streams\${version}.json" +& .\Installer\output-build-json.ps1 -version $version -url $url -stream $stream -published_at $published_at -outputPath $outputPath + +Copy-Item -Force "$scriptDirectory\release-streams\${version}.json" "$scriptDirectory\release-streams\${stream}.json" +echo "json file written to: $scriptDirectory\release-streams\${stream}.json" + if(! $jsonOnly) { - $scriptToExecute = Join-Path -Path $scriptDirectory -ChildPath "Installer\build.ps1" - & $scriptToExecute + & .\Installer\build.ps1 -version $version -url $url -stream $stream -published_at $published_at -jsonOnly $jsonOnly -revertGitAfter $revertGitAfter -versionQualifier $versionQualifier $exitCode = $LASTEXITCODE if($exitCode -gt 0) { Write-Host "build.ps1 failed!" exit $exitCode } - Write-Host "only updating the json at $scriptDirectory\release-streams\${stream}.json" - mkdir $scriptDirectory\release-streams\local\${version} -ErrorAction Ignore > $null - Move-Item -Force "./Installer/Output/Ziti Desktop Edge Client-${version}.exe" "$scriptDirectory\release-streams\local\${version}\Ziti.Desktop.Edge.Client-${version}.exe" - Move-Item -Force "./Installer/Output/Ziti Desktop Edge Client-${version}.exe.sha256" "$scriptDirectory\release-streams\local\${version}\Ziti.Desktop.Edge.Client-${version}.exe.sha256" + + mkdir "$scriptDirectory\release-streams\local\${version}" -ErrorAction Ignore > $null + #echo "$scriptDirectory/Installer/Output/Ziti Desktop Edge Client-${version}.exe" "$scriptDirectory\release-streams\local\${version}\Ziti.Desktop.Edge.Client-${version}.exe" + Move-Item -Force "$scriptDirectory/Installer/Output/Ziti Desktop Edge Client-${version}.exe" "$scriptDirectory\release-streams\local\${version}\Ziti.Desktop.Edge.Client-${version}.exe" + Move-Item -Force "$scriptDirectory/Installer/Output/Ziti Desktop Edge Client-${version}.exe.sha256" "$scriptDirectory\release-streams\local\${version}\Ziti.Desktop.Edge.Client-${version}.exe.sha256" + Write-Host "" + Write-Host "done." + Write-Host "installer exists at $scriptDirectory\release-streams\local\${version}\Ziti.Desktop.Edge.Client-${version}.exe" } -$outputPath = "${version}.json" -& .\Installer\output-build-json.ps1 -version $version -url $url -stream $stream -published_at $published_at -outputPath $outputPath -Copy-Item -Force "$outputPath" "$scriptDirectory\release-streams\local\${version}" -Copy-Item -Force "$outputPath" "$scriptDirectory\release-streams\local\${version}\test.json" -Copy-Item -Force "${version}.json" "$scriptDirectory\release-streams\${stream}.json" - -if(!$keepGitAfter) { +if($revertGitAfter) { git checkout DesktopEdge/Properties/AssemblyInfo.cs ZitiUpdateService/Properties/AssemblyInfo.cs Installer/ZitiDesktopEdge.aip } -echo "Done" -echo "json file written to: $scriptDirectory\release-streams\${stream}.json" -echo "run a python server to test: python -m http.server 8000 -d .\release-streams" \ No newline at end of file + +Write-Host "" +Write-Host "Dependencies from ziti-edge-tunnel:" +Write-Host "---------------------------------------------" +& '.\Installer\build\service\ziti-edge-tunnel.exe' version -v +Write-Host "" + +Write-Host "Start a python server in this location with:" +Write-Host "" +Write-Host " python -m http.server 8000" +Write-Host "" +Write-Host "Set the automatic upgrade url to http://localhost:8000/release-streams/local.json" +Write-Host "" diff --git a/release-streams/beta.json b/release-streams/beta.json index 4f4ebc326..69a64da10 100644 --- a/release-streams/beta.json +++ b/release-streams/beta.json @@ -1,12 +1,12 @@ { - "name": "2.4.0.0", - "tag_name": "2.4.0.0", - "published_at": "2024-07-01T18:18:53Z", + "name": "2.4.1.0", + "tag_name": "2.4.1.0", + "published_at": "2024-09-23T05:38:06Z", "installation_critical": false, "assets": [ { - "name": "Ziti.Desktop.Edge.Client-2.4.0.0.exe", - "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.4.0.0/Ziti.Desktop.Edge.Client-2.4.0.0.exe" + "name": "Ziti.Desktop.Edge.Client-2.4.1.0.exe", + "browser_download_url": "http://localhost:8000/release-streams/local/2.4.1.0/Ziti.Desktop.Edge.Client-2.4.1.0.exe" } ] } diff --git a/version b/version index 0131a90c3..42dece39c 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.4.0.2 \ No newline at end of file +2.4.1.0