From 834231cac12f1be9ecf481b2b58c0ef0639c2077 Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Sun, 5 Jun 2022 21:23:06 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20amd64v3=20=E6=94=B9=E5=90=8D=E4=B8=BAa?= =?UTF-8?q?md64,amd64v2=E6=94=B9=E4=B8=BAamd64-compatible,=20darwin?= =?UTF-8?q?=E5=88=A0=E9=99=A4v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 037ef1ae..74300aef 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ VERSION=beta-$(shell git rev-parse --short HEAD) else ifeq ($(BRANCH),) VERSION=$(shell git describe --tags) else -VERSION=unknown +VERSION=$(shell git rev-parse --short HEAD) endif BUILDTIME=$(shell date -u) @@ -17,11 +17,10 @@ GOBUILD=CGO_ENABLED=0 go build -trimpath -ldflags '-X "github.com/Dreamacro/clas -w -s -buildid=' PLATFORM_LIST = \ - darwin-amd64v2 \ - darwin-amd64v3 \ + darwin-amd64 \ darwin-arm64 \ - linux-amd64v2 \ - linux-amd64v3 \ + linux-amd64-compatible \ + linux-amd64 \ linux-armv5 \ linux-armv6 \ linux-armv7 \ @@ -39,22 +38,22 @@ PLATFORM_LIST = \ WINDOWS_ARCH_LIST = \ windows-386 \ - windows-amd64v2 \ - windows-amd64v3 \ + windows-amd64-compatible \ + windows-amd64 \ windows-arm64 \ windows-arm32v7 -all:linux-amd64v3 linux-arm64\ - darwin-amd64v3 darwin-arm64\ - windows-amd64v3 windows-arm64\ +all:linux-amd64 linux-arm64\ + darwin-amd64 darwin-arm64\ + windows-amd64 windows-arm64\ docker: GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ -darwin-amd64v3: +darwin-amd64: GOARCH=amd64 GOOS=darwin GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ -darwin-amd64v2: +darwin-amd64-compatible: GOARCH=amd64 GOOS=darwin GOAMD64=v2 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ darwin-arm64: @@ -63,10 +62,10 @@ darwin-arm64: linux-386: GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ -linux-amd64v3: +linux-amd64: GOARCH=amd64 GOOS=linux GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ -linux-amd64v2: +linux-amd64-compatible: GOARCH=amd64 GOOS=linux GOAMD64=v2 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ linux-arm64: @@ -114,10 +113,10 @@ freebsd-arm64: windows-386: GOARCH=386 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe -windows-amd64v3: +windows-amd64: GOARCH=amd64 GOOS=windows GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe -windows-amd64v2: +windows-amd64-compatible: GOARCH=amd64 GOOS=windows GOAMD64=v2 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe windows-arm64: