Embed CPU architecture info in Windows installer filename. (#18661)
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.
Austin S. Hemmelgarn committed
Oct 4, 2024 at 06:54 UTC
b052513c18b0f945f4f1c1fe38abd6a706cba335
3 files changed
+4
-4
.github/workflows/build.yml
+3
-2
@@ -342,7 +342,8 @@ jobs:
342
endpoint: "https://eus.codesigning.azure.net/"
343
trusted-signing-account-name: Netdata
344
certificate-profile-name: Netdata
345
- files: ${{ github.workspace }}\packaging\windows\netdata-installer.exe
345
+ files-folder: ${{ github.workspace }}\packaging\windows
346
+ files-folder-filter: exe
347
file-digest: SHA256
348
timestamp-rfc3161: "http://timestamp.acs.microsoft.com"
349
timestamp-digest: SHA256
@@ -351,7 +352,7 @@ jobs:
352
uses: actions/upload-artifact@v4
353
with:
354
name: windows-x86_64-installer
354
- path: packaging\windows\netdata-installer.exe
355
+ path: packaging\windows\netdata*.exe
356
retention-days: 30
357
- name: Failure Notification
358
uses: rtCamp/action-slack-notify@v2
packaging/windows/installer.nsi
+1
-1
@@ -3,7 +3,7 @@
3
!include "FileFunc.nsh"
4
5
Name "Netdata"
6
-Outfile "netdata-installer.exe"
6
+Outfile "netdata-installer-x64.exe"
7
InstallDir "$PROGRAMFILES\Netdata"
8
RequestExecutionLevel admin
9
packaging/windows/package-windows.sh
-1
@@ -58,4 +58,3 @@ NDMINORVERSION=$"$(grep 'CMAKE_PROJECT_VERSION_MINOR:STATIC' "${build}/CMakeCach
58
59
/mingw64/bin/makensis.exe -DCURRVERSION="${NDVERSION}" -DMAJORVERSION="${NDMAJORVERSION}" -DMINORVERSION="${NDMINORVERSION}" "${repo_root}/packaging/windows/installer.nsi"
60
${GITHUB_ACTIONS+echo "::endgroup::"}
61
-