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

fix agent building locally, in ci and on release #1233

Merged
merged 42 commits into from
Jan 27, 2023
Merged

Conversation

Racer159
Copy link
Contributor

Description

This PR hotfixes agent building in CI, on release and locally

Related Issue

Fixes #N/A

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (security config, docs update, etc)

Checklist before merging

@Racer159 Racer159 requested review from jeff-mccoy, YrrepNoj and a team as code owners January 21, 2023 02:45
@Racer159 Racer159 marked this pull request as draft January 21, 2023 09:13
@Racer159 Racer159 marked this pull request as ready for review January 23, 2023 17:14
@Racer159
Copy link
Contributor Author

Marking as ready for review, but wanted feedback on how to best handle the windows case. As I see it there would be a few ways to do it:

  1. Drop the if statement entirely and always build the local version of the agent
  2. Run both the linux/mac and windows versions of the command not caring that garbage will be output to the terminal
  3. Create a shim to convert if [ "agent:local" = "agent:local"]; then make build-agent-image; fi to if ( "agent:local" = "agent:local" ) { make build-agent-image }
  4. Now that we have fancy cmd syntax in the scripts to actions PR, add an OS only filter to that

@wirewc
Copy link
Contributor

wirewc commented Jan 27, 2023

LGTM!

src/types/runtime.go Outdated Show resolved Hide resolved
Copy link
Contributor

@jeff-mccoy jeff-mccoy left a comment

Choose a reason for hiding this comment

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

left a few notes

Copy link
Contributor

@jeff-mccoy jeff-mccoy left a comment

Choose a reason for hiding this comment

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

🥳

@jeff-mccoy jeff-mccoy merged commit fc7e619 into main Jan 27, 2023
@jeff-mccoy jeff-mccoy deleted the hotfix-agent-build branch January 27, 2023 23:28
Noxsios pushed a commit that referenced this pull request Mar 8, 2023
## Description

This PR hotfixes agent building in CI, on release and locally

## Related Issue

Fixes #N/A

## Type of change

- [X] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [X] Test, docs, adr added or updated as needed
- [X] [Contributor Guide
Steps](https://github.com/defenseunicorns/zarf/blob/main/CONTRIBUTING.md#developer-workflow)
followed
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.

3 participants