Support MacOS along side Linux #32
Merged
Conversation
This file contains 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
alexsnaps
changed the title
eguzki
requested changes
Mar 28, 2023
Makefile
Outdated
| $(PROTOC_BIN): | ||
| mkdir -p $(PROJECT_PATH)/bin | ||
| $(call get-protoc,$(PROJECT_PATH)/bin,https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-$(PROTOC_VERSION)-linux-x86_64.zip,sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0) | ||
| $(call get-protoc,$(PROJECT_PATH),https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-$(PROTOC_VERSION)-$(PROTOC_OS).zip,sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0) |
There was a problem hiding this comment.
what is that sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0) for?
There was a problem hiding this comment.
Dunno, didn't touch that... 🤣
| unzip -q protoc.zip bin/protoc ;\ | ||
| cp bin/protoc $(1) ;\ | ||
| chmod a+x $(1)/protoc ;\ | ||
| unzip -q protoc.zip bin/protoc -d $(1)/. ;\ |
There was a problem hiding this comment.
what about this change
diff --git a/Makefile b/Makefile
index 367fb37..7226e6f 100644
--- a/Makefile
+++ b/Makefile
@@ -68,8 +68,8 @@ stop-development:
# get-protoc will download zip from $2 and install it to $1.
define get-protoc
-@[ -f $(1) ] || { \
-echo "Downloading $(2) and installing in $(1)" ;\
+@{ \
+echo "Downloading $(2) and installing in $(1)/bin" ;\
set -e ;\
TMP_DIR=$$(mktemp -d) ;\
cd $$TMP_DIR ;\There was a problem hiding this comment.
I can add that, initially, as per the comment in the PR, I was also extracting the includes in $(1)/include...
eguzki
approved these changes
Mar 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I thought the includes were required too, but not extracting it seems fine too, i.e. without this: