Skip to content

Commit 6e446da

Browse files
authored
Merge pull request #48 from HarrisChu/fix_k6_package
fix k6 package
2 parents 7113a67 + d94b03c commit 6e446da

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ all: build
44
pairs := darwin/amd64 linux/amd64 linux/arm64
55
GOPATH ?= ~/go
66
export GO111MODULE=on
7-
K6_VERSION ?= v0.43.0
7+
K6_VERSION ?= v0.45.1
88
XK6_VERSION ?= v0.9.2
9+
VERSION=$(shell git describe --tags `git rev-list --tags --max-count=1`)
910

1011
fmt:
1112
find . -name '*.go' -exec gofmt -s -w {} +
@@ -15,13 +16,11 @@ lint :
1516

1617
build:
1718
go install go.k6.io/xk6/cmd/xk6@${XK6_VERSION}
18-
version=$(git describe --tags `git rev-list --tags --max-count=1`) \
19-
$(GOPATH)/bin/xk6 build $(K6_VERSION) --with github.com/vesoft-inc/k6-plugin@$(version) ;
19+
$(GOPATH)/bin/xk6 build $(K6_VERSION) --with github.com/vesoft-inc/k6-plugin@$(VERSION) ;
2020

2121
build-all: build-arm-v7
22-
2322
go install go.k6.io/xk6/cmd/xk6@${XK6_VERSION}
24-
for pair in $(pairs);do echo $$pair; \
23+
for pair in $(pairs);do echo $$pair; \
2524
os=`echo $$pair | cut -d / -f 1 ` ;\
2625
arch=`echo $$pair | cut -d / -f 2 ` ;\
2726
GOOS=$$os GOARCH=$$arch $(GOPATH)/bin/xk6 build $(K6_VERSION) --with github.com/vesoft-inc/k6-plugin@$(VERSION) ;\

0 commit comments

Comments
 (0)