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

Only set arch on bin dir when we are building for Windows #1851

Merged

Conversation

RebeccaMahany
Copy link
Contributor

We are currently setting the bin dir to /usr/local/kolide-k2/bin/amd64 on Linux, which we don't want to do yet. This PR makes sure we only add the arch to the bin dir if we're building for Windows.

@RebeccaMahany RebeccaMahany added the component:build&packaging Build and Package label Sep 6, 2024
pkg/packaging/fetch.go Outdated Show resolved Hide resolved
@RebeccaMahany RebeccaMahany marked this pull request as ready for review September 6, 2024 14:47
Copy link
Contributor

@James-Pickett James-Pickett left a comment

Choose a reason for hiding this comment

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

nice!

@RebeccaMahany
Copy link
Contributor Author

Tested for macOS:

launcher-1.10.1.flat.pkg % tree Payload/usr 
Payload/usr
└── local
    └── kolide-k2
        ├── Kolide.app
        │   └── Contents
        │       ├── CodeResources
        │       ├── Info.plist
        │       ├── MacOS
        │       │   └── launcher
        │       ├── Resources
        │       │   └── Kolide.icns
        │       ├── _CodeSignature
        │       │   └── CodeResources
        │       └── embedded.provisionprofile
        ├── bin
        │   ├── launcher -> ../Kolide.app/Contents/MacOS/launcher
        │   └── osqueryd -> ../osquery.app/Contents/MacOS/osqueryd
        └── osquery.app
            └── Contents
                ├── CodeResources
                ├── Info.plist
                ├── MacOS
                │   └── osqueryd
                ├── PkgInfo
                ├── Resources
                │   └── osqueryctl
                ├── _CodeSignature
                │   └── CodeResources
                └── embedded.provisionprofile

14 directories, 15 files

@RebeccaMahany RebeccaMahany added this pull request to the merge queue Sep 6, 2024
Merged via the queue into kolide:main with commit 3293600 Sep 6, 2024
31 checks passed
@RebeccaMahany RebeccaMahany deleted the becca/rm-arch-from-linux-package branch September 6, 2024 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:build&packaging Build and Package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants