Skip to content

Commit eded1f8

Browse files
authored
Revert riscv64 (#7657)
Related to #7654 (comment) <!-- !! Please DELETE this comment before posting. We appreciate your contribution to the Jaeger project! 👋🎉 --> ## Which problem is this PR solving? - <!-- Example: Resolves #123 --> ## Description of the changes - ## How was this change tested? - ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test`
1 parent ede1fc5 commit eded1f8

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SHELL := /bin/bash
55
JAEGER_IMPORT_PATH = github.com/jaegertracing/jaeger
66

77
# PLATFORMS is a list of all supported platforms
8-
PLATFORMS="linux/amd64,linux/arm64,linux/s390x,linux/ppc64le,linux/riscv64,darwin/amd64,darwin/arm64,windows/amd64"
8+
PLATFORMS="linux/amd64,linux/arm64,linux/s390x,linux/ppc64le,darwin/amd64,darwin/arm64,windows/amd64"
99
LINUX_PLATFORMS=$(shell echo "$(PLATFORMS)" | tr ',' '\n' | grep linux | tr '\n' ',' | sed 's/,$$/\n/')
1010

1111
# SRC_ROOT is the top of the source tree.
@@ -52,11 +52,9 @@ GO=go
5252
GOOS ?= $(shell $(GO) env GOOS)
5353
GOARCH ?= $(shell $(GO) env GOARCH)
5454

55-
# go test does not support -race flag on s390x and riscv64 architectures
55+
# go test does not support -race flag on s390x architecture
5656
ifeq ($(GOARCH), s390x)
5757
RACE=
58-
else ifeq ($(GOARCH), riscv64)
59-
RACE=
6058
else
6159
RACE=-race
6260
endif

scripts/build/docker/debug/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ COPY go.mod go.sum /go/src/debug-delve/
1010

1111
# TODO: Remove s390x once go-delve adds support for it (https://github.com/go-delve/delve/issues/2883)
1212
# TODO: Remove ppc64le once support is released (https://github.com/go-delve/delve/issues/1564) - not yet as of [email protected]
13-
# TODO: Remove riscv64 once its supported
14-
RUN if [[ "$TARGETARCH" == "s390x" || "$TARGETARCH" == "ppc64le" || "$TARGETARCH" == "riscv64" ]] ; then \
13+
RUN if [[ "$TARGETARCH" == "s390x" || "$TARGETARCH" == "ppc64le" ]] ; then \
1514
touch /go/bin/dlv; \
1615
else \
1716
cd /go/src/debug-delve && go mod download && go build -o /go/bin/dlv github.com/go-delve/delve/cmd/dlv; \

scripts/makefiles/BuildBinaries.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,6 @@ build-binaries-linux-arm64:
144144
build-binaries-linux-ppc64le:
145145
GOOS=linux GOARCH=ppc64le $(MAKE) _build-platform-binaries
146146

147-
.PHONY: build-binaries-linux-riscv64
148-
build-binaries-linux-riscv64:
149-
GOOS=linux GOARCH=riscv64 $(MAKE) _build-platform-binaries
150-
151147
# build all binaries for one specific platform GOOS/GOARCH
152148
.PHONY: _build-platform-binaries
153149
_build-platform-binaries: \

0 commit comments

Comments
 (0)