diff --git a/.github/pr-title-checker-config.json b/.github/pr-title-checker-config.json deleted file mode 100644 index f270dc6..0000000 --- a/.github/pr-title-checker-config.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "LABEL": { - "name": "Invalid PR Title", - "color": "B60205" - }, - "CHECKS": { - "regexp": "^(feat|fix|test|refactor|chore|style|docs|perf|build|ci|revert)(\\(.*\\))?:.*", - "ignoreLabels" : ["ignore-title"] - } -} diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8e1fa31..9a8029a 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,8 +1,10 @@ -I hereby agree to the terms of the [GreptimeDB CLA](https://gist.github.com/xtang/6378857777706e568c1949c7578592cc) +I hereby agree to the terms of the [GreptimeDB CLA](https://github.com/GreptimeTeam/.github/blob/main/CLA.md). + +## Refer to a related PR or issue link (optional) ## What's changed and what's your intention? -_PLEASE DO NOT LEAVE THIS EMPTY !!!_ +__!!! DO NOT LEAVE THIS BLOCK EMPTY !!!__ Please explain IN DETAIL what the changes are in this PR and why they are needed: @@ -15,5 +17,3 @@ Please explain IN DETAIL what the changes are in this PR and why they are needed - [ ] I have written the necessary comments. - [ ] I have added the necessary unit tests and integration tests. - -## Refer to a related PR or issue link (optional) diff --git a/.github/workflows/license.yaml b/.github/workflows/license.yaml index 286cd15..b7fc582 100644 --- a/.github/workflows/license.yaml +++ b/.github/workflows/license.yaml @@ -11,6 +11,6 @@ jobs: runs-on: ubuntu-20.04 name: license-header-check steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Check License Header - uses: korandoru/hawkeye@v3 + uses: korandoru/hawkeye@v5 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 77efd1c..db3ddbc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,8 +16,8 @@ jobs: name: Spell Check with Typos runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 - - uses: crate-ci/typos@v1.0.4 + - uses: actions/checkout@v4 + - uses: crate-ci/typos@master check: name: Check @@ -25,12 +25,12 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 60 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: "1.18.4" - - uses: arduino/setup-protoc@v1 + - uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - uses: dtolnay/rust-toolchain@master @@ -45,16 +45,14 @@ jobs: make go test $(git status --porcelain=v1 | wc -l) -eq 0 || (echo "Fail: generated go protobuf in github action is different from pushed ones" ; exit 1) - - fmt: name: Rustfmt if: github.event.pull_request.draft == false runs-on: ubuntu-20.04 timeout-minutes: 60 steps: - - uses: actions/checkout@v3 - - uses: arduino/setup-protoc@v1 + - uses: actions/checkout@v4 + - uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - uses: dtolnay/rust-toolchain@master @@ -72,8 +70,8 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 60 steps: - - uses: actions/checkout@v3 - - uses: arduino/setup-protoc@v1 + - uses: actions/checkout@v4 + - uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - uses: dtolnay/rust-toolchain@master diff --git a/.github/workflows/mvn_publish.yml b/.github/workflows/mvn_publish.yml index aa91441..b67fb5a 100644 --- a/.github/workflows/mvn_publish.yml +++ b/.github/workflows/mvn_publish.yml @@ -10,12 +10,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Git Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 1.8 + distribution: 'zulu' server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD diff --git a/.github/workflows/pr-title-checker.yml b/.github/workflows/pr-title-checker.yml index fc586c7..5fd4b79 100644 --- a/.github/workflows/pr-title-checker.yml +++ b/.github/workflows/pr-title-checker.yml @@ -1,4 +1,4 @@ -name: "PR Title Checker" +name: "Semantic Pull Request" on: pull_request_target: types: @@ -13,8 +13,6 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 10 steps: - - uses: thehanimo/pr-title-checker@v1.3.4 + - uses: amannn/action-semantic-pull-request@v5 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - pass_on_octokit_error: false - configuration_path: ".github/pr-title-checker-config.json" diff --git a/.typos.toml b/.typos.toml new file mode 100644 index 0000000..3910405 --- /dev/null +++ b/.typos.toml @@ -0,0 +1,5 @@ +[files] +extend-exclude = [ + # Exclude all generated files + "**/greptime/v1/**", +] diff --git a/go/greptime/v1/meta/common.pb.go b/go/greptime/v1/meta/common.pb.go index ce72c3d..ccaed29 100644 --- a/go/greptime/v1/meta/common.pb.go +++ b/go/greptime/v1/meta/common.pb.go @@ -498,7 +498,7 @@ func (x *KeyValue) GetValue() []byte { return nil } -// Procedure identifer +// Procedure identifier type ProcedureId struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/java/src/main/java/greptime/v1/meta/Common.java b/java/src/main/java/greptime/v1/meta/Common.java index bba768e..f6b69b3 100644 --- a/java/src/main/java/greptime/v1/meta/Common.java +++ b/java/src/main/java/greptime/v1/meta/Common.java @@ -5085,7 +5085,7 @@ java.lang.String defaultValue); } /** *
-   * Procedure identifer
+   * Procedure identifier
    * 
* * Protobuf type {@code greptime.v1.meta.ProcedureId} @@ -5340,7 +5340,7 @@ java.lang.String defaultValue); } /** *
-     * Procedure identifer
+     * Procedure identifier
      * 
* * Protobuf type {@code greptime.v1.meta.ProcedureId} diff --git a/proto/greptime/v1/meta/common.proto b/proto/greptime/v1/meta/common.proto index 149e3c1..b00ca8a 100644 --- a/proto/greptime/v1/meta/common.proto +++ b/proto/greptime/v1/meta/common.proto @@ -68,5 +68,5 @@ message KeyValue { bytes value = 2; } -// Procedure identifer +// Procedure identifier message ProcedureId { bytes key = 1; } diff --git a/proto/prometheus/remote/remote.proto b/proto/prometheus/remote/remote.proto index 9d84d51..b98ad61 100644 --- a/proto/prometheus/remote/remote.proto +++ b/proto/prometheus/remote/remote.proto @@ -14,7 +14,7 @@ syntax = "proto3"; package prometheus; -// GreptimeTeam modify the original go_package definition to make it constistent with the go package name. +// GreptimeTeam modify the original go_package definition to make it consistent with the go package name. // And we also remove the gogoproto dependency which is now deprecated. option go_package = "github.com/GreptimeTeam/greptime-proto/go/prometheus/remote"; diff --git a/proto/prometheus/remote/types.proto b/proto/prometheus/remote/types.proto index 78feeaf..293f082 100644 --- a/proto/prometheus/remote/types.proto +++ b/proto/prometheus/remote/types.proto @@ -14,7 +14,7 @@ syntax = "proto3"; package prometheus; -// GreptimeTeam modify the original go_package definition to make it constistent with the go package name. +// GreptimeTeam modify the original go_package definition to make it consistent with the go package name. // And we also remove the gogoproto dependency which is now deprecated. option go_package = "github.com/GreptimeTeam/greptime-proto/go/prometheus/remote";