Skip to content

Commit

Permalink
branch name related changes (#146)
Browse files Browse the repository at this point in the history
Signed-off-by: disksing <[email protected]>
  • Loading branch information
disksing authored Jun 23, 2021
1 parent d63c289 commit b384d71
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 49 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Compatibility Test

on:
push:
branches: [ v2 ]
branches: [ master ]
pull_request:
branches: [ v2 ]
branches: [ master ]

jobs:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Integration Test

on:
push:
branches: [ v2 ]
branches: [ master ]
pull_request:
branches: [ v2 ]
branches: [ master ]

jobs:

Expand Down
41 changes: 0 additions & 41 deletions .github/workflows/lint.yml

This file was deleted.

20 changes: 18 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Unit Test

on:
push:
branches: [ v2 ]
branches: [ master ]
pull_request:
branches: [ v2 ]
branches: [ master ]

jobs:
test:
Expand All @@ -19,3 +19,19 @@ jobs:

- name: Test
run: go test -v ./...

golangci:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16

- name: Lint
uses: golangci/golangci-lint-action@v2
with:
version: v1.29
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ TiKV Go Client provides support for interacting with the [TiKV](https://github.c

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

- `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.
- `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.

- `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/).

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

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

## Contributing to client-go

Expand Down

0 comments on commit b384d71

Please sign in to comment.