Skip to content

Commit

Permalink
Merge pull request #12 from HarrisChu/force_k6_version
Browse files Browse the repository at this point in the history
when building binary should specify k6 version
  • Loading branch information
Nicole00 authored Feb 14, 2022
2 parents 025b366 + d05588d commit 8fa43e8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,30 @@ pairs := darwin/amd64 linux/amd64 linux/arm64
GOPATH ?= ~/go
export GO111MODULE=on
VERSION ?= v0.0.8
K6_VERSION ?= v0.33.0

build:
go install github.com/k6io/xk6/cmd/[email protected]
$(GOPATH)/bin/xk6 build --with github.com/vesoft-inc/k6-plugin@$(VERSION);
$(GOPATH)/bin/xk6 build $(K6_VERSION) --with github.com/vesoft-inc/k6-plugin@$(VERSION);

build-all: build-arm-v7

go install github.com/k6io/xk6/cmd/[email protected]
for pair in $(pairs);do echo $$pair; \
os=`echo $$pair | cut -d / -f 1 ` ;\
arch=`echo $$pair | cut -d / -f 2 ` ;\
GOOS=$$os GOARCH=$$arch $(GOPATH)/bin/xk6 build --with github.com/vesoft-inc/k6-plugin@$(VERSION) ;\
GOOS=$$os GOARCH=$$arch $(GOPATH)/bin/xk6 build $(K6_VERSION) --with github.com/vesoft-inc/k6-plugin@$(VERSION) ;\
mv k6 k6-$$os-$$arch; \
done

build-arm-v7:
go install github.com/k6io/xk6/cmd/[email protected]
GOOS=linux GOARCH=arm64 GOARM=7 $(GOPATH)/bin/xk6 build --with github.com/vesoft-inc/k6-plugin@$(VERSION);
GOOS=linux GOARCH=arm64 GOARM=7 $(GOPATH)/bin/xk6 build $(K6_VERSION) --with github.com/vesoft-inc/k6-plugin@$(VERSION);
mv k6 k6-linux-arm64-v7

build-dev:
go install github.com/k6io/xk6/cmd/[email protected]
$(GOPATH)/bin/xk6 build --with github.com/vesoft-inc/k6-plugin@latest=${PWD}/../k6-plugin;
$(GOPATH)/bin/xk6 build $(K6_VERSION) --with github.com/vesoft-inc/k6-plugin@latest=${PWD}/../k6-plugin;

.PHONY: format
format:
Expand Down
2 changes: 0 additions & 2 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ type (
Log nebula.Logger
DataChs []chan Data
OutoptCh chan []string
Version string
csvStrategy csvReaderStrategy
initialized bool
sessions []*nebula.Session
Expand Down Expand Up @@ -97,7 +96,6 @@ func New() *NebulaPool {
return &NebulaPool{
Log: nebula.DefaultLogger{},
initialized: false,
Version: version,
}
}

Expand Down
2 changes: 0 additions & 2 deletions register.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import (
"go.k6.io/k6/js/modules"
)

const version = "v0.0.6"

func init() {
modules.Register("k6/x/nebulagraph", New())
}

0 comments on commit 8fa43e8

Please sign in to comment.