From 8d762db40ef95b230467b5c76df43a65f8c17c49 Mon Sep 17 00:00:00 2001 From: Joseph Franck Date: Fri, 10 Apr 2026 16:06:37 -0500 Subject: [PATCH 1/2] fix release for windows --- .github/workflows/main-branch.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main-branch.yaml b/.github/workflows/main-branch.yaml index b71806d..50b99d8 100644 --- a/.github/workflows/main-branch.yaml +++ b/.github/workflows/main-branch.yaml @@ -46,11 +46,17 @@ jobs: pyinstaller correct_images_gui_onefile.spec --noconfirm --clean - name: Create zip files + shell: pwsh run: | - cd "$GITHUB_WORKSPACE" - zip -r dist/ImageryCorrector.zip dist/ImageryCorrector.exe - zip -r dist/GetCorrectionsCsv.zip dist/GetCorrectionsCsv.exe - zip -r dist/SenteraRadiometricCorrectionsGUI.zip dist/SenteraRadiometricCorrectionsGUI.exe + Set-Location $env:GITHUB_WORKSPACE + + if (Test-Path "dist/ImageryCorrector.zip") { Remove-Item "dist/ImageryCorrector.zip" } + if (Test-Path "dist/GetCorrectionsCsv.zip") { Remove-Item "dist/GetCorrectionsCsv.zip" } + if (Test-Path "dist/SenteraRadiometricCorrectionsGUI.zip") { Remove-Item "dist/SenteraRadiometricCorrectionsGUI.zip" } + + Compress-Archive -Path "dist/ImageryCorrector.exe" -DestinationPath "dist/ImageryCorrector.zip" + Compress-Archive -Path "dist/GetCorrectionsCsv.exe" -DestinationPath "dist/GetCorrectionsCsv.zip" + Compress-Archive -Path "dist/SenteraRadiometricCorrectionsGUI.exe" -DestinationPath "dist/SenteraRadiometricCorrectionsGUI.zip" From 91d4e733e58b4df7ac8946b0d3da38d2fae7b048 Mon Sep 17 00:00:00 2001 From: Joseph Franck Date: Fri, 10 Apr 2026 16:24:34 -0500 Subject: [PATCH 2/2] add version to zip file names --- .github/workflows/main-branch.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main-branch.yaml b/.github/workflows/main-branch.yaml index 50b99d8..41659a2 100644 --- a/.github/workflows/main-branch.yaml +++ b/.github/workflows/main-branch.yaml @@ -49,14 +49,15 @@ jobs: shell: pwsh run: | Set-Location $env:GITHUB_WORKSPACE + $version = "${{ steps.read_toml.outputs.value }}" - if (Test-Path "dist/ImageryCorrector.zip") { Remove-Item "dist/ImageryCorrector.zip" } - if (Test-Path "dist/GetCorrectionsCsv.zip") { Remove-Item "dist/GetCorrectionsCsv.zip" } - if (Test-Path "dist/SenteraRadiometricCorrectionsGUI.zip") { Remove-Item "dist/SenteraRadiometricCorrectionsGUI.zip" } + if (Test-Path "dist/ImageryCorrector-$version.zip") { Remove-Item "dist/ImageryCorrector-$version.zip" } + if (Test-Path "dist/GetCorrectionsCsv-$version.zip") { Remove-Item "dist/GetCorrectionsCsv-$version.zip" } + if (Test-Path "dist/SenteraRadiometricCorrectionsGUI-$version.zip") { Remove-Item "dist/SenteraRadiometricCorrectionsGUI-$version.zip" } - Compress-Archive -Path "dist/ImageryCorrector.exe" -DestinationPath "dist/ImageryCorrector.zip" - Compress-Archive -Path "dist/GetCorrectionsCsv.exe" -DestinationPath "dist/GetCorrectionsCsv.zip" - Compress-Archive -Path "dist/SenteraRadiometricCorrectionsGUI.exe" -DestinationPath "dist/SenteraRadiometricCorrectionsGUI.zip" + Compress-Archive -Path "dist/ImageryCorrector.exe" -DestinationPath "dist/ImageryCorrector-$version.zip" + Compress-Archive -Path "dist/GetCorrectionsCsv.exe" -DestinationPath "dist/GetCorrectionsCsv-$version.zip" + Compress-Archive -Path "dist/SenteraRadiometricCorrectionsGUI.exe" -DestinationPath "dist/SenteraRadiometricCorrectionsGUI-$version.zip" @@ -73,6 +74,6 @@ jobs: target_commitish: ${{ github.sha }} generate_release_notes: true files: | - dist/ImageryCorrector.zip - dist/GetCorrectionsCsv.zip - dist/SenteraRadiometricCorrectionsGUI.zip + dist/ImageryCorrector-${{ steps.read_toml.outputs.value }}.zip + dist/GetCorrectionsCsv-${{ steps.read_toml.outputs.value }}.zip + dist/SenteraRadiometricCorrectionsGUI-${{ steps.read_toml.outputs.value }}.zip