From 064bce28249ce447dfc29bd5cf00fb35d849d87f Mon Sep 17 00:00:00 2001 From: hmsjy2017 <1462668901@qq.com> Date: Tue, 26 Apr 2022 10:19:19 +0800 Subject: [PATCH 1/3] Add s390x architecture support --- Makefile | 2 ++ install.sh | 3 +++ package.sh | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9ab98fc..9431c99 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,8 @@ build-linux-arm: GOOS=linux GOARCH=arm $(GO) build $(GO_FLAGS) -o bin/linux-arm/g build-linux-arm64: GOOS=linux GOARCH=arm64 $(GO) build $(GO_FLAGS) -o bin/linux-arm64/g +build-linux-s390x: + GOOS=linux GOARCH=s390x $(GO) build $(GO_FLAGS) -o bin/linux-s390x/g build-darwin: build-darwin-amd64 build-darwin-arm64 diff --git a/install.sh b/install.sh index 6202670..e357617 100755 --- a/install.sh +++ b/install.sh @@ -16,6 +16,9 @@ function get_arch() { "armv6l" | "armv7l") echo "arm" ;; + "s390x") + echo "s390x" + ;; *) echo ${NIL} ;; diff --git a/package.sh b/package.sh index d7ea192..07eca54 100755 --- a/package.sh +++ b/package.sh @@ -13,6 +13,12 @@ function get_arch() { "aarch64" | "arm64") echo "arm64" ;; + "armv6l" | "armv7l") + echo "arm" + ;; + "s390x") + echo "s390x" + ;; *) echo ${NIL} ;; @@ -50,7 +56,7 @@ main() { local release="1.3.0" - for item in "darwin_amd64" "darwin_arm64" "linux_386" "linux_amd64" "linux_arm" "linux_arm64" "windows_386" "windows_amd64" "windows_arm" "windows_arm64"; do + for item in "darwin_amd64" "darwin_arm64" "linux_386" "linux_amd64" "linux_arm" "linux_arm64" "linux_s390x" "windows_386" "windows_amd64" "windows_arm" "windows_arm64"; do package ${release} ${item} done From 765abf254283085b383c310fc23ef73d2e07ca69 Mon Sep 17 00:00:00 2001 From: hmsjy2017 <1462668901@qq.com> Date: Tue, 26 Apr 2022 10:29:23 +0800 Subject: [PATCH 2/3] fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9431c99..9ed96e8 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ install: build build-all: build-linux build-darwin build-windows -build-linux: build-linux-386 build-linux-amd64 build-linux-arm build-linux-arm64 +build-linux: build-linux-386 build-linux-amd64 build-linux-arm build-linux-arm64 build-linux-s390x build-linux-386: GOOS=linux GOARCH=386 $(GO) build $(GO_FLAGS) -o bin/linux-386/g build-linux-amd64: From 07a5192fceca85da992143272eb82104ff49f98c Mon Sep 17 00:00:00 2001 From: Tony <1462668901@qq.com> Date: Tue, 26 Apr 2022 11:05:55 +0800 Subject: [PATCH 3/3] fix --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9ed96e8..29af1d1 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ build-linux-arm: build-linux-arm64: GOOS=linux GOARCH=arm64 $(GO) build $(GO_FLAGS) -o bin/linux-arm64/g build-linux-s390x: - GOOS=linux GOARCH=s390x $(GO) build $(GO_FLAGS) -o bin/linux-s390x/g + GOOS=linux GOARCH=s390x $(GO) build $(GO_FLAGS) -o bin/linux-s390x/g build-darwin: build-darwin-amd64 build-darwin-arm64 @@ -56,4 +56,4 @@ clean: rm -f sha256sum.txt rm -rf bin -.PHONY: all build install test package clean build-linux build-darwin build-windows build-linux-386 build-linux-amd64 build-linux-arm build-linux-arm64 build-darwin-amd64 build-darwin-arm64 build-windows-386 build-windows-amd64 build-windows-arm build-windows-arm64 +.PHONY: all build install test package clean build-linux build-darwin build-windows build-linux-386 build-linux-amd64 build-linux-arm build-linux-arm64 build-linux-s390x build-darwin-amd64 build-darwin-arm64 build-windows-386 build-windows-amd64 build-windows-arm build-windows-arm64