Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

when building binary should specify k6 version #12

Merged
merged 2 commits into from
Feb 14, 2022
Merged

when building binary should specify k6 version #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ba5999
force k6 version
HarrisChu Feb 9, 2022
d05588d
fix
HarrisChu Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
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/xk6@v0.4.1
$(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/xk6@v0.4.1
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/xk6@v0.4.1
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/xk6@v0.4.1
$(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
View file
Open in desktop
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
View file
Open in desktop
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())
}