Build arm64 MSI packages additionally to the current amd64 ones #482

philipbalinov · 2024-10-16T13:22:07Z

remove hardcoded amd64 string everywhere
parametrize builds to run for both amd64 and arm64
Successfully tested against local windows 10 arm64 VM

Caveats

installer filenames have changed from mondoo.msi to mondoo_<arch>.msi, e.g. mondoo_arm64.msi
we should probably update the documentation at https://console.mondoo.com/space/integrations/add/mondoo/windows

afiune

Looking good!

afiune · 2024-10-21T09:54:13Z

.github/workflows/pkg_msi.yaml

@@ -53,12 +53,17 @@ jobs:
          echo "trimmed_version=$(echo ${V} | sed 's/-.*//')" >> $GITHUB_OUTPUT
      - name: Ensure version of cnquery and cnspec are available
        run: |
-          curl -sL --head --fail https://github.com/mondoohq/cnquery/releases/download/v${{ steps.version.outputs.version }}/cnquery_${{ steps.version.outputs.version }}_windows_amd64.zip
-          curl -sL --head --fail https://github.com/mondoohq/cnspec/releases/download/v${{ steps.version.outputs.version }}/cnspec_${{ steps.version.outputs.version }}_windows_amd64.zip
+          curl -sL --head --fail https://github.com/mondoohq/cnquery/releases/download/v11.26.0/cnquery_11.26.0_windows_amd64.zip \


why do I feel this command went from being parameterized to be hardcoded? 🤔

oops! fixed 👍

afiune · 2024-10-21T09:56:16Z

packages/msi/msi/Product.wxs

+<?define RegistrationTokenRequired = "0"?>
+<?define OtherSKU = "$(var.UpgradeCodeEnterprise)"?>
+<?else?>
+<?define InstallerVersion="200"?>


for my own learning, what are these InstallerVersion for and, why these numbers 200 and 500?¿

apparently - I'm not expert mysel - that is the minimum MS Installer version, these are the recommendations for x64 and arm as per https://wixtoolset.org/docs/v3/xsd/wix/package/
In reality, 200 seems to be Windows 2000-era, and 500 - Windows 7, so these numbers are super conservative.

afiune · 2024-10-21T09:57:54Z

packages/msi/package.ps1

 cd msi
 # delete previous intermediate files
 Remove-Item .\Product.wixobj -ErrorAction Ignore
 Remove-Item .\mondoo.wixpdb -ErrorAction Ignore
 # build package
 dir 'C:\Program Files (x86)\'
 info "run candle (standard)"
-& 'C:\Program Files (x86)\WiX Toolset v3.14\bin\candle' -nologo -arch x64 -dMondooSKU="standard" -dProductVersion="$version" -ext WixUtilExtension Product.wxs
+& 'C:\Program Files (x86)\WiX Toolset v3.14\bin\candle' -nologo  -dMondooSKU="standard" -darch="$platform" -dProductVersion="$version" -ext WixUtilExtension Product.wxs


nit extra whitespace

Suggested change

& 'C:\Program Files (x86)\WiX Toolset v3.14\bin\candle' -nologo -dMondooSKU="standard" -darch="$platform" -dProductVersion="$version" -ext WixUtilExtension Product.wxs

& 'C:\Program Files (x86)\WiX Toolset v3.14\bin\candle' -nologo -dMondooSKU="standard" -darch="$platform" -dProductVersion="$version" -ext WixUtilExtension Product.wxs

afiune · 2024-10-21T09:58:46Z

packages/msi/msi/Product.wxs

 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
  <Product Name="$(var.ProductName)" Version="$(var.ProductVersion)" Manufacturer="Mondoo, Inc." Language="1033" Codepage="1252" Id="*" UpgradeCode="$(var.UpgradeCode)">
    <!-- custom action do not work if its not privileged-->
    <Package
      Description="Mondoo verifies your system for known vulnerabilities"
      Manufacturer="Mondoo, Inc."
-      InstallerVersion="200"
+      InstallerVersion="$(var.InstallerVersion)"
      Compressed="yes"
      Comments="Windows Installer Package"
      Platform="x64"


shouldn't there be an arm section too?

removed the Platform attribute entirely - it's considered deprecated and is overriden by passing -arch to candle.exe anyway

afiune · 2024-10-21T09:59:39Z

packages/msi/package.ps1

@@ -16,22 +19,24 @@ function info($msg) {  Write-Host $msg -f white }

 info "build msi package $version"
 # delete previous build
-Remove-Item .\mondoo.msi -ErrorAction Ignore
+Remove-Item ".\mondoo_${arch}.msi" -ErrorAction Ignore


If the intend is to delete previous builds, for x64, should we try to remove the previous location too?

kept both lines just in case, although in reality this runs in CI against an empty directory each time, so none of the files will ever be there

- remove hardcoded amd64 string everywhere - parametrize builds to run for both amd64 and arm64 Signed-off-by: Philip Balinov <[email protected]>

…nker to produce an .exe may fix it

…g the linker to produce an .exe may fix it" This reverts commit 87528ed.

- Try to remove old installer filename `mondoo.msi' as well - Remove some extra whitespace

afiune

I don't have a windows machine to test with, but everything looks good to me.

benr

Fully tested cnquery installed by MSI on an Azure ARM Windows 11 Enterprise instance. Worked perfectly. Binaries are properly signed.

Great job @philipbalinov !!!

philipbalinov requested a review from benr October 16, 2024 13:22

philipbalinov marked this pull request as ready for review October 17, 2024 08:00

philipbalinov changed the title ~~Initial commit for adding support for arm64 MSI packages~~ Build arm64 MSI packages additionally to the current amd64 ones Oct 18, 2024

afiune reviewed Oct 21, 2024

View reviewed changes

philipbalinov added 21 commits October 21, 2024 13:42

Initial commit for adding support for arm64 MSI packages

bd9ff2f

- remove hardcoded amd64 string everywhere - parametrize builds to run for both amd64 and arm64 Signed-off-by: Philip Balinov <[email protected]>

set unique names on artifacts

6029681

fix missing dist/ subdir

53409ab

fix missing artifact name typo

e20e027

learn things about powershell

f604311

learn things about powershell, updated

4ea500a

fix arch parameter being passed to candle utility

a949df1

the small things in powershell tripping me up

8f622e9

there was whitespace after <?, a sin in Wix-land

b57397b

yet another syntax error

76f3894

add missing variables in conditional statement

0c643ea

add arch to msi filenames where missing

2c3e8bb

second attempt at string interpolation in powershell

105eaaa

add trace info to powershell

031d999

Fix wrong paths to arch-specific cnspec/cnquery

b6f758b

msi filename for x86 should say 'amd64' for consistency

7c90d54

add multiarch support to publish test too

df83e0f

.msi files are corrupt. According to The Internet(tm), telling the li…

81622a7

…nker to produce an .exe may fix it

Revert ".msi files are corrupt. According to The Internet(tm), tellin…

6cc9bf9

…g the linker to produce an .exe may fix it" This reverts commit 87528ed.

revert hardcoded variables used for testing

bbb89e6

Remove hardcoded version numbers used for testing

2985bf1

philipbalinov force-pushed the philip/arm64-msi-installer branch from 72993ee to 2985bf1 Compare October 21, 2024 10:45

philipbalinov added 3 commits October 21, 2024 13:47

Fix copy-paste error

033e697

Fix copy-paste error 2

1046dff

Small fixes to powershell script

e48f9e4

- Try to remove old installer filename `mondoo.msi' as well - Remove some extra whitespace

afiune approved these changes Oct 21, 2024

View reviewed changes

benr approved these changes Oct 22, 2024

View reviewed changes

benr merged commit ee25760 into main Oct 24, 2024
9 checks passed

benr deleted the philip/arm64-msi-installer branch October 24, 2024 15:56

github-actions bot locked and limited conversation to collaborators Oct 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Build arm64 MSI packages additionally to the current amd64 ones #482

Build arm64 MSI packages additionally to the current amd64 ones #482

philipbalinov commented Oct 16, 2024 •

edited

Loading

afiune left a comment

afiune Oct 21, 2024

philipbalinov Oct 21, 2024

afiune Oct 21, 2024

philipbalinov Oct 21, 2024

afiune Oct 21, 2024

philipbalinov Oct 21, 2024

afiune Oct 21, 2024

philipbalinov Oct 21, 2024

afiune Oct 21, 2024

philipbalinov Oct 21, 2024

afiune left a comment

benr left a comment

	& 'C:\Program Files (x86)\WiX Toolset v3.14\bin\candle' -nologo -dMondooSKU="standard" -darch="$platform" -dProductVersion="$version" -ext WixUtilExtension Product.wxs
	& 'C:\Program Files (x86)\WiX Toolset v3.14\bin\candle' -nologo -dMondooSKU="standard" -darch="$platform" -dProductVersion="$version" -ext WixUtilExtension Product.wxs

Build arm64 MSI packages additionally to the current amd64 ones #482

Build arm64 MSI packages additionally to the current amd64 ones #482

Conversation

philipbalinov commented Oct 16, 2024 • edited Loading

Caveats

afiune left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

afiune left a comment

Choose a reason for hiding this comment

benr left a comment

Choose a reason for hiding this comment

philipbalinov commented Oct 16, 2024 •

edited

Loading