Remove duplicate dist directive #2887
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
krajorama
reviewed
Sep 5, 2022
Comment on lines
-598
to
-600
| if [ "$$os" = "darwin" ] && [ "$$arch" = "386" ]; then \ | ||
| continue; \ | ||
| fi; \ |
There was a problem hiding this comment.
Excluding darwin/386 is not in the other one
There was a problem hiding this comment.
Full diff:
***************
*** 2,14 ****
rm -fr ./dist
mkdir -p ./dist
# Build binaries for various architectures and operating systems. Only
! # mimirtool supports Windows for now.
for os in linux darwin windows; do \
! for arch in amd64 arm64; do \
suffix="" ; \
if [ "$$os" = "windows" ]; then \
suffix=".exe" ; \
fi; \
echo "Building mimirtool for $$os/$$arch"; \
GOOS=$$os GOARCH=$$arch CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/mimirtool-$$os-$$arch$$suffix ./cmd/mimirtool; \
sha256sum ./dist/mimirtool-$$os-$$arch$$suffix | cut -d ' ' -f 1 > ./dist/mimirtool-$$os-$$arch$$suffix-sha-256; \
--- 2,18 ----
rm -fr ./dist
mkdir -p ./dist
# Build binaries for various architectures and operating systems. Only
! # mimirtool supports Windows for now. Also darwin/386 is not a valid
! # architecture.
for os in linux darwin windows; do \
! for arch in 386 amd64 arm64; do \
suffix="" ; \
if [ "$$os" = "windows" ]; then \
suffix=".exe" ; \
fi; \
+ if [ "$$os" = "darwin" ] && [ "$$arch" = "386" ]; then \
+ continue; \
+ fi; \
echo "Building mimirtool for $$os/$$arch"; \
GOOS=$$os GOARCH=$$arch CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/mimirtool-$$os-$$arch$$suffix ./cmd/mimirtool; \
sha256sum ./dist/mimirtool-$$os-$$arch$$suffix | cut -d ' ' -f 1 > ./dist/mimirtool-$$os-$$arch$$suffix-sha-256; \
***************
*** 21,32 ****
echo "Building query-tee for $$os/$$arch"; \
GOOS=$$os GOARCH=$$arch CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/query-tee-$$os-$$arch$$suffix ./cmd/query-tee; \
sha256sum ./dist/query-tee-$$os-$$arch$$suffix | cut -d ' ' -f 1 > ./dist/query-tee-$$os-$$arch$$suffix-sha-256; \
- echo "Building metaconvert for $$os/$$arch"; \
- GOOS=$$os GOARCH=$$arch CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/metaconvert-$$os-$$arch$$suffix ./cmd/metaconvert; \
- sha256sum ./dist/metaconvert-$$os-$$arch$$suffix | cut -d ' ' -f 1 > ./dist/metaconvert-$$os-$$arch$$suffix-sha-256; \
- echo "Building mimir-continuous-test for $$os/$$arch"; \
- GOOS=$$os GOARCH=$$arch CGO_ENABLED=0 go build $(GO_FLAGS) -o ./dist/mimir-continuous-test-$$os-$$arch$$suffix ./cmd/mimir-continuous-test; \
- sha256sum ./dist/mimir-continuous-test-$$os-$$arch$$suffix | cut -d ' ' -f 1 > ./dist/mimir-continuous-test-$$os-$$arch$$suffix-sha-256; \
done; \
done; \
touch $@
--- 25,30 ----
There was a problem hiding this comment.
We don't exclude it because we don't do a 386 build there wasn't a 386 build last release as well.
krajorama
approved these changes
Sep 5, 2022
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.
What this PR does
Fixes an issue where we had duplicate dist directives in our makefile which caused an issue while building release packages. This cleans up the hacked makefile I was running earlier and fixes the issue going forward.