Skip to content

Commit b384d71

Browse files
authored
branch name related changes (#146)
Signed-off-by: disksing <i@disksing.com>
1 parent d63c289 commit b384d71

File tree

5 files changed

+24
-49
lines changed

5 files changed

+24
-49
lines changed

.github/workflows/compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Compatibility Test
22

33
on:
44
push:
5-
branches: [ v2 ]
5+
branches: [ master ]
66
pull_request:
7-
branches: [ v2 ]
7+
branches: [ master ]
88

99
jobs:
1010

.github/workflows/integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Integration Test
22

33
on:
44
push:
5-
branches: [ v2 ]
5+
branches: [ master ]
66
pull_request:
7-
branches: [ v2 ]
7+
branches: [ master ]
88

99
jobs:
1010

.github/workflows/lint.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Unit Test
22

33
on:
44
push:
5-
branches: [ v2 ]
5+
branches: [ master ]
66
pull_request:
7-
branches: [ v2 ]
7+
branches: [ master ]
88

99
jobs:
1010
test:
@@ -19,3 +19,19 @@ jobs:
1919

2020
- name: Test
2121
run: go test -v ./...
22+
23+
golangci:
24+
runs-on: ubuntu-latest
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@v2
28+
29+
- name: Set up Go
30+
uses: actions/setup-go@v2
31+
with:
32+
go-version: 1.16
33+
34+
- name: Lint
35+
uses: golangci/golangci-lint-action@v2
36+
with:
37+
version: v1.29

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ TiKV Go Client provides support for interacting with the [TiKV](https://github.c
1414

1515
There are 2 major versions of the `client-go` package.
1616

17-
- `v2` is the new stable and active version. This version was extracted from [pingcap/tidb](https://github.com/pingcap/tidb) and it includes new TiKV features like Follower Read, 1PC, Async Commit. The development of this version is on the `v2` branch. The documentation for this version is below.
17+
- `v2` is the new stable and active version. This version was extracted from [pingcap/tidb](https://github.com/pingcap/tidb) and it includes new TiKV features like Follower Read, 1PC, Async Commit. The development of this version is on the `master` branch. The documentation for this version is below.
1818

1919
- `v1` is the previous stable version and is only maintained for bug fixes. You can read the documentation [here](https://tikv.org/docs/4.0/reference/clients/go/).
2020

@@ -24,7 +24,7 @@ There are 2 major versions of the `client-go` package.
2424
go get github.com/tikv/client-go/v2@COMMIT_HASH_OR_TAG_VERSION
2525
```
2626

27-
More examples can be found in [examples directory](https://github.com/tikv/client-go/tree/v2/examples).
27+
More examples can be found in [examples directory](https://github.com/tikv/client-go/tree/master/examples).
2828

2929
## Contributing to client-go
3030

0 commit comments

Comments
 (0)