From 7a184720d3d5ebb8ca91b70edba9ac03c5988237 Mon Sep 17 00:00:00 2001 From: Huntarr Developer Date: Tue, 20 May 2025 08:31:18 -0400 Subject: [PATCH 1/4] chore: bump version from 7.0.5 to 7.0.6 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index c60ebc18..ec997167 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -7.0.5 \ No newline at end of file +7.0.6 \ No newline at end of file From 86ce479cbf3e89eb203b921458502b97a4a8a23a Mon Sep 17 00:00:00 2001 From: Huntarr Developer Date: Tue, 20 May 2025 08:37:34 -0400 Subject: [PATCH 2/4] Add GitHub release publishing to Windows NSIS workflow --- .github/workflows/windows-build-nsis.yml | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.github/workflows/windows-build-nsis.yml b/.github/workflows/windows-build-nsis.yml index 2d29818c..d92d05cf 100644 --- a/.github/workflows/windows-build-nsis.yml +++ b/.github/workflows/windows-build-nsis.yml @@ -1,8 +1,14 @@ name: Windows Build with NSIS +# Add permissions needed for creating releases +permissions: + contents: write + on: push: branches: [ "main", "dev", "win-*" ] + tags: + - "*" # This will trigger on any tag push pull_request: branches: [ "main", "dev" ] workflow_dispatch: @@ -13,6 +19,20 @@ jobs: steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Extract metadata + id: meta + shell: bash + run: | + if [[ "${{ github.ref }}" == refs/tags/* ]]; then + echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT + echo "IS_TAG=true" >> $GITHUB_OUTPUT + else + echo "VERSION=$(cat version.txt)" >> $GITHUB_OUTPUT + echo "IS_TAG=false" >> $GITHUB_OUTPUT + fi - name: Set up Python uses: actions/setup-python@v4 @@ -94,3 +114,11 @@ jobs: with: name: huntarr-installer path: installer/Huntarr_Setup.exe + + - name: Upload to release + if: steps.meta.outputs.IS_TAG == 'true' + uses: softprops/action-gh-release@v1 + with: + files: installer/Huntarr_Setup.exe + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 7d083c784acc163644c8550c359c6681085ebe6a Mon Sep 17 00:00:00 2001 From: Huntarr Developer Date: Tue, 20 May 2025 09:22:54 -0400 Subject: [PATCH 3/4] Update Windows installer to use versioned filename format --- .github/workflows/windows-build-nsis.yml | 9 +++++---- distribution/windows/installer/huntarr_installer.nsi | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows-build-nsis.yml b/.github/workflows/windows-build-nsis.yml index d92d05cf..792ada05 100644 --- a/.github/workflows/windows-build-nsis.yml +++ b/.github/workflows/windows-build-nsis.yml @@ -96,11 +96,12 @@ jobs: & "C:\Program Files (x86)\NSIS\makensis.exe" $MakensisArgs # Check if installer was created - $installerPath = "distribution\windows\installer\installer\Huntarr_Setup.exe" + $version = (Get-Content version.txt).Trim() + $installerPath = "distribution\windows\installer\installer\Huntarr-${version}-win.exe" if (Test-Path $installerPath) { Write-Host "Installer created successfully at $installerPath" # Copy to expected upload location - Copy-Item -Path $installerPath -Destination "installer\Huntarr_Setup.exe" -Force + Copy-Item -Path $installerPath -Destination "installer\Huntarr-${version}-win.exe" -Force } else { Write-Error "Installer was not created. Check the logs above for errors." exit 1 @@ -113,12 +114,12 @@ jobs: uses: actions/upload-artifact@v4 with: name: huntarr-installer - path: installer/Huntarr_Setup.exe + path: installer/Huntarr-*-win.exe - name: Upload to release if: steps.meta.outputs.IS_TAG == 'true' uses: softprops/action-gh-release@v1 with: - files: installer/Huntarr_Setup.exe + files: installer/Huntarr-*-win.exe env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/distribution/windows/installer/huntarr_installer.nsi b/distribution/windows/installer/huntarr_installer.nsi index 1ddbc319..a6440e72 100644 --- a/distribution/windows/installer/huntarr_installer.nsi +++ b/distribution/windows/installer/huntarr_installer.nsi @@ -41,7 +41,8 @@ ; General settings Name "${APPNAME}" -OutFile "installer\${APPNAME}_Setup.exe" +!echo "Creating installer: Huntarr-${VERSION}-win.exe" +OutFile "installer\Huntarr-${VERSION}-win.exe" InstallDir "$PROGRAMFILES64\${APPNAME}" InstallDirRegKey HKLM "Software\${APPNAME}" "Install_Dir" RequestExecutionLevel admin ; Request admin privileges From 1be25b663c0dc781e00a72e1e67ea7c604749c84 Mon Sep 17 00:00:00 2001 From: Huntarr Developer Date: Tue, 20 May 2025 09:25:45 -0400 Subject: [PATCH 4/4] chore: bump version from 7.0.6 to 7.0.7 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index ec997167..bf993904 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -7.0.6 \ No newline at end of file +7.0.7 \ No newline at end of file