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

better handling of path differences for MSI installers #7035

Merged
merged 12 commits into from Aug 5, 2022
Merged

Conversation

roperzh
Copy link
Member

@roperzh roperzh commented Aug 3, 2022

Related to #7036, Tested in:

  • macOS via fleetctl package --type=msi (non-native)
  • Linux native via docker run -v "$(pwd)" fleetdm/fleetctl package --type=msi (native)
  • Windows via fleetctl pacakge --type=msi (thanks to @edwardsb) (non-native)

Checklist for submitter

If some of the following don't apply, delete the relevant line.

  • Changes file added for user-visible changes (in changes/ and/or orbit/changes/).
  • Added/updated tests
  • Manual QA for all new/changed functionality

@roperzh roperzh temporarily deployed to Docker Hub August 3, 2022 17:21 Inactive
@codecov-commenter
Copy link

codecov-commenter commented Aug 3, 2022

Codecov Report

Merging #7035 (efb0c1d) into main (82ba1a0) will increase coverage by 0.25%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #7035      +/-   ##
==========================================
+ Coverage   59.72%   59.97%   +0.25%     
==========================================
  Files         405      403       -2     
  Lines       37877    37712     -165     
==========================================
- Hits        22622    22619       -3     
+ Misses      13038    12876     -162     
  Partials     2217     2217              
Impacted Files Coverage Δ
orbit/pkg/packaging/wix/wix.go
orbit/pkg/packaging/wix/transform.go

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@roperzh roperzh temporarily deployed to Docker Hub August 3, 2022 17:40 Inactive
@roperzh roperzh marked this pull request as ready for review August 3, 2022 17:40
@roperzh roperzh requested a review from a team as a code owner August 3, 2022 17:40
@@ -39,14 +25,14 @@ func Heat(path string, native bool) error {
args = append(
args,
"docker", "run", "--rm", "--platform", "linux/amd64",
"--volume", path+":"+path, // mount volume
"--volume", path+":/wix", // mount volume
Copy link
Member Author

Choose a reason for hiding this comment

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

this was the crux of the problem, as we were providing Windows-like paths on Windows for the bind mount

lucasmrod
lucasmrod previously approved these changes Aug 3, 2022
Copy link
Member

@lucasmrod lucasmrod left a comment

Choose a reason for hiding this comment

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

Looks great!

Were you able to test both modes? (native and !native)

@roperzh
Copy link
Member Author

roperzh commented Aug 4, 2022

Were you able to test both modes? (native and !native)

yes! I updated the list in the PR description to include (native) or (non-native) to the list of targets we tested so it's more clear. The list is:

  • macOS via fleetctl package --type=msi (non-native)
  • Linux native via docker run -v "$(pwd)" fleetdm/fleetctl package --type=msi (native)
  • Windows via fleetctl pacakge --type=msi (thanks to @\edwardsb) (non-native)

@roperzh roperzh requested a review from a team August 4, 2022 17:22
@roperzh roperzh temporarily deployed to Docker Hub August 4, 2022 17:22 Inactive
@roperzh roperzh temporarily deployed to Docker Hub August 4, 2022 18:57 Inactive
@roperzh roperzh temporarily deployed to Docker Hub August 4, 2022 21:10 Inactive
@roperzh roperzh temporarily deployed to Docker Hub August 5, 2022 13:00 Inactive
@roperzh roperzh temporarily deployed to Docker Hub August 5, 2022 13:33 Inactive
@roperzh roperzh temporarily deployed to Docker Hub August 5, 2022 13:58 Inactive
@roperzh roperzh temporarily deployed to Docker Hub August 5, 2022 17:24 Inactive
@roperzh roperzh temporarily deployed to Docker Hub August 5, 2022 17:27 Inactive
@roperzh roperzh temporarily deployed to Docker Hub August 5, 2022 17:32 Inactive
@roperzh roperzh enabled auto-merge (squash) August 5, 2022 17:33
@roperzh roperzh merged commit 6fead4c into main Aug 5, 2022
@roperzh roperzh deleted the windows-msi branch August 5, 2022 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants