chore(deps): OS agnostic make generate
#5414
Open
+16
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was a bit cumbersome because of the multiple ways of setting the work environemnt (local vs MinGW Go/make installation). I don't think we should handle all the cases and each user that runs `make generate` should be able to fix their environment to make it work. I've used MinGW64 + local Go installation and it's working.
ariasmn
requested review from
joanlopez and
oleiade
and removed request for
a team
ariasmn
commented
Nov 15, 2025
Comment on lines
+5
to
+7
| ifeq ($(OS),Windows_NT) | ||
| DETECTED_OS := Windows | ||
| PROTOC_ARCHIVE := protoc-$(PROTOC_VERSION)-win64.zip |
Contributor
Author
There was a problem hiding this comment.
Maybe someone with more Windows expertise can help here, because I don't really know how to set it up correctly. From what I've gathered:
- The
OSenvironment variable is always present on Windows, so it's safe to use. - I tested this using MSYS2 with a native Go installation, not the MSYS2 Go package.
Also, I didn't differentiate between 32-bit and 64-bit Windows since we don't do that for Linux either, but it could be added if needed. But in the 64-bit VM is working fine.
ariasmn
commented
Nov 15, 2025
Comment on lines
+24
to
25
| @if [ -z "$(DETECTED_OS)" ]; then \ | ||
| echo "Error: Can't install protoc on your OS, please install protoc-$(PROTOC_VERSION) manually." >&2; \ |
Contributor
Author
There was a problem hiding this comment.
I maintained the same logic here, but this could be improved by checking if protoc is already installed and skipping the download entirely. Currently, even if you have protoc installed manually, the task will fail if your OS doesn't match Windows, Linux, or Darwin. Should be fairly easy to add.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What?
Updated the
Makefileto automatically detect the operating system and download the appropriate protoc binary for Windows, Linux, and macOS when running thegeneratetask.Had a Mac laying around gathering dust, decided to set it up and do this quick PR because why not. Tested on a M1 Pro, although since it's using the universal binary should work on Intel based ones too.
For Windows, tested on a Windows 11 VM.
Why?
The previous Makefile only supported Linux, causing build failures on macOS and Windows.
Checklist
make check) and all pass.Checklist: Documentation (only for k6 maintainers and if relevant)
Please do not merge this PR until the following items are filled out.
Related PR(s)/Issue(s)
Closes #4966