Skip to content

Commit

Permalink
Added support for ppc64le (#5290)
Browse files Browse the repository at this point in the history
* Added support for ppc64le

Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>

* Updated Changelog

Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>

* Updated promu & protoc

Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>

* Updated Makefile comment

Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>
  • Loading branch information
mgiessing committed Apr 21, 2022
1 parent b5056fe commit 24706d6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions .promu.yml
Expand Up @@ -20,3 +20,4 @@ crossbuild:
- linux/arm64
- windows/amd64
- freebsd/amd64
- linux/ppc64le
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -16,6 +16,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re

- [#5220](https://github.com/thanos-io/thanos/pull/5220) Query Frontend: Add `--query-frontend.forward-header` flag, forward headers to downstream querier.
- [#5250](https://github.com/thanos-io/thanos/pull/5250/files) Querier: Expose Query and QueryRange APIs through GRPC.
- [#5290](https://github.com/thanos-io/thanos/pull/5290) Add support for ppc64le

### Changed

Expand Down
15 changes: 9 additions & 6 deletions Makefile
Expand Up @@ -26,13 +26,16 @@ else ifeq ($(arch), arm64)
# arm64
BASE_DOCKER_SHA=${arm64}
else ifeq ($(arch), aarch64)
# arm64
BASE_DOCKER_SHA=${arm64}
# arm64
BASE_DOCKER_SHA=${arm64}
else ifeq ($(arch), ppc64le)
# ppc64le
BASE_DOCKER_SHA=${ppc64le}
else
echo >&2 "only support amd64 or arm64 arch" && exit 1
echo >&2 "only support amd64, arm64 or ppc64le arch" && exit 1
endif
DOCKER_ARCHS ?= amd64 arm64
# Generate two target: docker-xxx-amd64, docker-xxx-arm64.
DOCKER_ARCHS ?= amd64 arm64 ppc64le
# Generate three targets: docker-xxx-amd64, docker-xxx-arm64, docker-xxx-ppc64le.
# Run make docker-xxx -n to see the result with dry run.
BUILD_DOCKER_ARCHS = $(addprefix docker-build-,$(DOCKER_ARCHS))
TEST_DOCKER_ARCHS = $(addprefix docker-test-,$(DOCKER_ARCHS))
Expand Down Expand Up @@ -157,7 +160,7 @@ ifeq ($(GIT_BRANCH), main)
crossbuild: | $(PROMU)
@echo ">> crossbuilding all binaries"
# we only care about below two for the main branch
$(PROMU) crossbuild -v -p linux/amd64 -p linux/arm64
$(PROMU) crossbuild -v -p linux/amd64 -p linux/arm64 -p linux/ppc64le
else
crossbuild: | $(PROMU)
@echo ">> crossbuilding all binaries"
Expand Down
2 changes: 2 additions & 0 deletions scripts/installprotoc.sh
Expand Up @@ -21,6 +21,7 @@ is_supported_platform() {
linux/amd64) found=0 ;;
linux/i386) found=0 ;;
linux/arm64) found=0 ;;
linux/ppc64le) found=0 ;;
esac
return $found
}
Expand All @@ -37,6 +38,7 @@ adjust_arch() {
amd64) ARCH=x86_64 ;;
i386) ARCH=x86_32 ;;
arm64) ARCH=aarch_64 ;;
ppc64le) ARCH=ppcle_64 ;;
esac
true
}
Expand Down

0 comments on commit 24706d6

Please sign in to comment.