diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml index 5df6e5a9da..88b3dc76c9 100644 --- a/.github/workflows/compatibility.yml +++ b/.github/workflows/compatibility.yml @@ -2,9 +2,9 @@ name: Compatibility Test on: push: - branches: [ v2 ] + branches: [ master ] pull_request: - branches: [ v2 ] + branches: [ master ] jobs: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index d75c6227bc..fde71e133a 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -2,9 +2,9 @@ name: Integration Test on: push: - branches: [ v2 ] + branches: [ master ] pull_request: - branches: [ v2 ] + branches: [ master ] jobs: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 63463c53c6..0000000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Lint -on: - push: - branches: - - v* - pull_request: -jobs: - 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: - # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: v1.29 - - # Optional: working directory, useful for monorepos - # working-directory: somedir - - # Optional: golangci-lint command line arguments. - # args: --issues-exit-code=0 - - # Optional: show only new issues if it's a pull request. The default value is `false`. - # only-new-issues: true - - # Optional: if set to true then the action will use pre-installed Go. - # skip-go-installation: true - - # Optional: if set to true then the action don't cache or restore ~/go/pkg. - # skip-pkg-cache: true - - # Optional: if set to true then the action don't cache or restore ~/.cache/go-build. - # skip-build-cache: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 41016ae2d2..74fd579ad6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,9 +2,9 @@ name: Unit Test on: push: - branches: [ v2 ] + branches: [ master ] pull_request: - branches: [ v2 ] + branches: [ master ] jobs: test: @@ -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 diff --git a/README.md b/README.md index 8260f9bee1..bbbbec4c09 100644 --- a/README.md +++ b/README.md @@ -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/). @@ -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