Skip to content

Commit

Permalink
fix arm64 build (#408)
Browse files Browse the repository at this point in the history
Signed-off-by: Ping Yu <yuping@pingcap.com>
  • Loading branch information
pingyu authored Jun 17, 2024
1 parent db0ae72 commit 16dc003
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ jobs:
run: |
export GOPATH=${GITHUB_WORKSPACE}/go
export PATH=$PATH:$GOPATH/bin
export GOOS=${{ matrix.os }}
export GOARCH=${{ matrix.arch }}
export TARGET_OS=${{ matrix.os }}
export TARGET_ARCH=${{ matrix.arch }}
if [ ! -z ${{ steps.check_staging.outputs.STAGING }} ]; then
export REL_VER=${{ steps.check_staging.outputs.STAGING }}+staging
else
Expand Down
2 changes: 1 addition & 1 deletion br/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ build:
CGO_ENABLED=1 $(GO) build -tags codes -gcflags "all=-N -l" -ldflags '$(LDFLAGS)' -o $(BR_BIN_PATH) cmd/br/*.go

release:
CGO_ENABLED=1 $(GO) build -tags codes -ldflags '$(LDFLAGS)' -o $(BR_BIN_PATH) cmd/br/*.go
CGO_ENABLED=1 GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(GO) build -tags codes -ldflags '$(LDFLAGS)' -o $(BR_BIN_PATH) cmd/br/*.go

build/rawkv-integration-test:
cd tests/rawkv && $(GO) build -mod=mod -o ../../bin/rawkv_test *.go
Expand Down
4 changes: 2 additions & 2 deletions cdc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ endif

BUILD_FLAG := -buildvcs=false

GOBUILD := CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO) build $(BUILD_FLAG) -trimpath $(GOVENDORFLAG)
GOBUILD := CGO_ENABLED=0 GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(GO) build $(BUILD_FLAG) -trimpath $(GOVENDORFLAG)
GOBUILD_DEBUG := CGO_ENABLED=0 $(GO) build $(BUILD_FLAG) -gcflags "all=-N -l" $(GOVENDORFLAG)
GOBUILDNOVENDOR := CGO_ENABLED=0 $(GO) build $(BUILD_FLAG) -trimpath
GOTEST := CGO_ENABLED=1 $(GO) test -p $(P) --race
Expand All @@ -45,7 +45,7 @@ FAILPOINT_DISABLE := $$(echo $(FAILPOINT_DIR) | xargs $(FAILPOINT) disable >/dev

RELEASE_VERSION ?=
ifeq ($(RELEASE_VERSION),)
RELEASE_VERSION := v1.2-master
RELEASE_VERSION := v1.3-master
release_version_regex := ^cdc-v[0-9]\..*$$
release_branch_regex := "^cdc-[0-9]\.[0-9].*$$|^HEAD$$|^.*/*tags/cdc-v[0-9]\.[0-9]\..*$$"
ifneq ($(shell git rev-parse --abbrev-ref HEAD | egrep $(release_branch_regex)),)
Expand Down

0 comments on commit 16dc003

Please sign in to comment.