Skip to content

Commit

Permalink
Merge pull request grafana#24 from grafana/rename
Browse files Browse the repository at this point in the history
Move to vanity url and update go versions
  • Loading branch information
mstoykov committed Aug 24, 2021
2 parents 34d4383 + 1eefb2b commit aa75311
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
go-version: [ 1.14.x, 1.15.x, 1.16.x ]
go-version: [ 1.16.x, 1.17.x ]

# Set some variables per OS, usable via ${{ matrix.VAR }}
# XK6_BIN_PATH: the path to the compiled k6 binary, for artifact publishing
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
go-version: [ 1.14.x ]
go-version: [ 1.16.x ]
runs-on: ${{ matrix.os }}

steps:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
`xk6` - Custom k6 Builder
===============================

This command line tool and associated Go package makes it easy to make custom builds of [k6](https://github.com/k6io/k6).
This command line tool and associated Go package makes it easy to make custom builds of [k6](https://github.com/grafana/k6).

It is used heavily by k6 extension developers as well as anyone who wishes to make custom `k6` binaries (with or without extensions).

Expand All @@ -15,10 +15,10 @@ Stay updated, be aware of changes, and please submit feedback! Thanks!

## Install

You can [download binaries](https://github.com/k6io/xk6/releases) that are already compiled for your platform, or build `xk6` from source:
You can [download binaries](https://github.com/grafana/xk6/releases) that are already compiled for your platform, or build `xk6` from source:

```bash
$ go install github.com/k6io/xk6/cmd/xk6@latest
$ go install go.k6.io/xk6/cmd/xk6@latest
```


Expand Down
2 changes: 1 addition & 1 deletion cmd/xk6/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"runtime"
"strings"

"github.com/k6io/xk6"
"go.k6.io/xk6"
)

var (
Expand Down
16 changes: 8 additions & 8 deletions cmd/xk6/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,27 +91,27 @@ func TestNormalizeImportPath(t *testing.T) {

tests := testCaseType{
{"linux-path", args{
currentModule: "github.com/k6io/xk6",
currentModule: "go.k6.io/xk6",
cwd: "/xk6",
moduleDir: "/xk6",
}, "github.com/k6io/xk6"},
}, "go.k6.io/xk6"},
{"linux-subpath", args{
currentModule: "github.com/k6io/xk6",
currentModule: "go.k6.io/xk6",
cwd: "/xk6/subdir",
moduleDir: "/xk6",
}, "github.com/k6io/xk6/subdir"},
}, "go.k6.io/xk6/subdir"},
}
windowsTests := testCaseType{
{"windows-path", args{
currentModule: "github.com/k6io/xk6",
currentModule: "go.k6.io/xk6",
cwd: "c:\\xk6",
moduleDir: "c:\\xk6",
}, "github.com/k6io/xk6"},
}, "go.k6.io/xk6"},
{"windows-subpath", args{
currentModule: "github.com/k6io/xk6",
currentModule: "go.k6.io/xk6",
cwd: "c:\\xk6\\subdir",
moduleDir: "c:\\xk6",
}, "github.com/k6io/xk6/subdir"},
}, "go.k6.io/xk6/subdir"},
}
if runtime.GOOS == "windows" {
tests = append(tests, windowsTests...)
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/k6io/xk6
module go.k6.io/xk6

go 1.15
go 1.16

require github.com/Masterminds/semver/v3 v3.1.0

0 comments on commit aa75311

Please sign in to comment.