Skip to content

Commit

Permalink
Embed CPU architecture info in Windows installer filename. (netdata#1…
Browse files Browse the repository at this point in the history
…8661)

This ensures forward-portability, because I can all but guarantee that
we _will_ eventually want to publish 64-bit ARM binaries for Windows,
and we will then need to differentiate between the installer files.
  • Loading branch information
Ferroin authored Oct 4, 2024
1 parent 3a5e256 commit b052513
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,8 @@ jobs:
endpoint: "https://eus.codesigning.azure.net/"
trusted-signing-account-name: Netdata
certificate-profile-name: Netdata
files: ${{ github.workspace }}\packaging\windows\netdata-installer.exe
files-folder: ${{ github.workspace }}\packaging\windows
files-folder-filter: exe
file-digest: SHA256
timestamp-rfc3161: "http://timestamp.acs.microsoft.com"
timestamp-digest: SHA256
Expand All @@ -351,7 +352,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: windows-x86_64-installer
path: packaging\windows\netdata-installer.exe
path: packaging\windows\netdata*.exe
retention-days: 30
- name: Failure Notification
uses: rtCamp/action-slack-notify@v2
Expand Down
2 changes: 1 addition & 1 deletion packaging/windows/installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
!include "FileFunc.nsh"

Name "Netdata"
Outfile "netdata-installer.exe"
Outfile "netdata-installer-x64.exe"
InstallDir "$PROGRAMFILES\Netdata"
RequestExecutionLevel admin

Expand Down
1 change: 0 additions & 1 deletion packaging/windows/package-windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,3 @@ NDMINORVERSION=$"$(grep 'CMAKE_PROJECT_VERSION_MINOR:STATIC' "${build}/CMakeCach

/mingw64/bin/makensis.exe -DCURRVERSION="${NDVERSION}" -DMAJORVERSION="${NDMAJORVERSION}" -DMINORVERSION="${NDMINORVERSION}" "${repo_root}/packaging/windows/installer.nsi"
${GITHUB_ACTIONS+echo "::endgroup::"}

0 comments on commit b052513

Please sign in to comment.