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

Ensure code is formatted #147

Merged
merged 5 commits into from Jan 4, 2023
Merged

Ensure code is formatted #147

merged 5 commits into from Jan 4, 2023

Conversation

lukebakken
Copy link
Contributor

Also bump Windows dep versions

@lukebakken lukebakken self-assigned this Dec 22, 2022
@lukebakken lukebakken added this to the 1.6.0 milestone Dec 22, 2022
Copy link
Contributor

@Zerpet Zerpet left a comment

Choose a reason for hiding this comment

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

Looks good. I have a few cosmetic adjustments in mind. I'll assign you as reviewer after I push my changes 👀

@Zerpet
Copy link
Contributor

Zerpet commented Jan 2, 2023

For some reason, it is failing in GitHub actions build-linux, but it is succeeding in my local machine (using act) and in build-windows 🤯

@Zerpet
Copy link
Contributor

Zerpet commented Jan 2, 2023

Ok, so the problem is that the Action merges the PR, somehow, and then runs our make check-fmt. It is pulling from main the changes we merged recently in #145. The changes in #145 need formatting, and that's what's causing havoc.

It's not the best developer experience, but it ensures that folks rebase their branches against the main branch before the PR checks pass.

Why it doesn't fail on windoze is a mystery to me ❗

Mistery solved: windows build does not run make check-fmt, so it doesn't fail.

@Zerpet
Copy link
Contributor

Zerpet commented Jan 2, 2023

@lukebakken we can merge main into your feature branch (ugh, imo), or rebase the feature branch against the main branch. Then go fmt .. Either will make the checks pass. I don't want to rebase your branch myself because it will create git weirdness in your local clone.

@lukebakken
Copy link
Contributor Author

@Zerpet do whatever works. I certainly don't mind if you force push to my branch because actually it shouldn't affect me locally and if it does, whatever. I'll check this out tomorrow.

lukebakken and others added 4 commits January 4, 2023 06:18
Also bump Windows dep versions
- Clarifications
- Formatting

Signed-off-by: Aitor Pérez Cedres <acedres@vmware.com>
Signed-off-by: Aitor Pérez Cedres <acedres@vmware.com>
@lukebakken lukebakken merged commit dd91ad5 into main Jan 4, 2023
@lukebakken lukebakken deleted the lukebakken/gofmt-check branch January 4, 2023 14:44
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.

None yet

2 participants