Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start to include arch in packaging targets + packaging commands #1198

Merged
merged 4 commits into from
May 24, 2023

Conversation

RebeccaMahany
Copy link
Contributor

@RebeccaMahany RebeccaMahany commented May 16, 2023

Relates to #1149

This is a small part of the packaging updates: specifying the architecture we're building for when building packages, to allow us to later specify arm64 when we'd like to build arm64 packages. For macOS, this amounted to moving a hardcoded line out of the dist file, to be set by an option instead. For our FPM packaging, this amounted to passing in the -a flag, again set by an option. For our Wix build, this is already set: https://github.com/kolide/launcher/blob/main/pkg/packagekit/wix/wix.go#L274

@RebeccaMahany RebeccaMahany marked this pull request as ready for review May 18, 2023 21:07
Copy link
Contributor

@directionless directionless left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shape looks okay. Do you also need to patch kworker, or will this fallback to universal? I agree with james about early returns.

@RebeccaMahany
Copy link
Contributor Author

Shape looks okay. Do you also need to patch kworker, or will this fallback to universal? I agree with james about early returns.

@directionless it'll fall back to universal for darwin and amd64 for the other two -- no new packaging options or command-line flags at the moment!

@RebeccaMahany RebeccaMahany merged commit 920fa34 into kolide:main May 24, 2023
@RebeccaMahany RebeccaMahany deleted the becca/set-arch-in-installer branch May 24, 2023 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants