Skip to content

Commit

Permalink
Merge branch 'main' into refactor-bloom-filter
Browse files Browse the repository at this point in the history
  • Loading branch information
Little-Wallace authored Feb 1, 2023
2 parents 95085ee + 3d9077b commit 0f7bfa2
Show file tree
Hide file tree
Showing 1,426 changed files with 11,261 additions and 7,568 deletions.
17 changes: 11 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
I hereby agree to the terms of the [Singularity Data, Inc. Contributor License Agreement](https://gist.github.com/skyzh/0663682a70b0edde7ae991492f2314cb#file-s9y_cla).
I hereby agree to the terms of the [RisingWave Labs, Inc. Contributor License Agreement](https://gist.github.com/TennyZhuang/f00be7f16996ea48effb049aa7be4d66#file-rw_cla).

## What's changed and what's your intention?

<!--
**This section will be used as the commit message. Please do not leave this empty!**
Please explain **IN DETAIL** what the changes are in this PR and why they are needed:
Expand All @@ -11,11 +13,14 @@ Please explain **IN DETAIL** what the changes are in this PR and why they are ne
- Describe clearly one logical change and avoid lazy messages (optional)
- Describe any limitations of the current code (optional)
-->

## Checklist

- [ ] I have written necessary rustdoc comments
- [ ] I have added necessary unit tests and integration tests
- [ ] I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features).
- [ ] I have demonstrated that backward compatibility is not broken by breaking changes and created issues to track deprecated features to be removed in the future. (Please refer the issue)
- [ ] All checks passed in `./risedev check` (or alias, `./risedev c`)

## Documentation
Expand All @@ -26,11 +31,11 @@ If your pull request contains user-facing changes, please specify the types of t

Please keep the types that apply to your changes, and remove those that do not apply.

* Installation and deployment
* Connector (sources & sinks)
* SQL commands, functions, and operators
* RisingWave cluster configuration changes
* Other (please specify in the release note below)
- Installation and deployment
- Connector (sources & sinks)
- SQL commands, functions, and operators
- RisingWave cluster configuration changes
- Other (please specify in the release note below)

### Release note

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dashboard_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
dashboard-ui-deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: '18'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dashboard_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
paths: [dashboard/**, proto/**]

concurrency:
group: dashbaord-build-${{ github.ref }}
group: dashboard-build-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y make build-essential cmake protobuf-compiler curl openssl libssl-dev libsasl2-dev libcurl4-openssl-dev pkg-config postgresql-client tmux lld
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/license_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
runs-on: ubuntu-latest
name: license-header-check
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Check License Header
uses: apache/skywalking-eyes/header@main
19 changes: 19 additions & 0 deletions .github/workflows/protobuf-breaking.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Protobuf Breaking Check

on:
pull_request:
branches: [main]
paths: [proto/**]

jobs:
buf-breaking-check:
runs-on: ubuntu-latest
name: Check breaking changes in Protobuf files
steps:
- uses: actions/checkout@v2
- uses: bufbuild/buf-setup-action@v1
# Run breaking change detection against the `main` branch
- uses: bufbuild/buf-breaking-action@v1
with:
input: 'proto'
against: 'https://github.com/risingwavelabs/risingwave.git#branch=main,subdir=proto'
2 changes: 1 addition & 1 deletion .github/workflows/typo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Actions Repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Check spelling of the entire repository
uses: crate-ci/typos@v1.11.1
2 changes: 1 addition & 1 deletion .licenserc.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
header:
license:
spdx-id: Apache-2.0
copyright-owner: Singularity Data
copyright-owner: RisingWave Labs

paths:
- "src/**/*.rs"
Expand Down
18 changes: 0 additions & 18 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,6 @@ queue_rules:
- "label=mergify/can-merge"

pull_request_rules:
- name: Automatic merge on approval (high priority)
conditions:
- "base=main"
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- "check-success=buildkite/pull-request"
- "check-failure!=buildkite/docker"
- "check-success=task-list-completed"
- "label=mergify/can-merge"
- "label=mergify/high-priority"
actions:
queue:
name: default
method: squash
priority: high
commit_message_template: *commit_message_template

- name: Automatic merge on approval
conditions:
- "base=main"
Expand All @@ -52,7 +35,6 @@ pull_request_rules:
queue:
name: default
method: squash
priority: medium
commit_message_template: *commit_message_template

- name: Notify author on queue failure
Expand Down
8 changes: 7 additions & 1 deletion .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ numer = "numer"
nd = "nd"

[files]
extend-exclude = ["src/tests/regress/data", "e2e_test", "**/*.svg", "scripts"]
extend-exclude = [
"src/tests/regress/data",
"e2e_test",
"**/*.svg",
"scripts",
"src/frontend/planner_test/tests/testdata",
]
5 changes: 3 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ To report bugs, create a [GitHub issue](https://github.com/risingwavelabs/rising

## Table of contents

- [Contribution guidelines](#contribution-guidelines)
- [Table of contents](#table-of-contents)
- [Tests and miscellaneous checks](#tests-and-miscellaneous-checks)
- [Submit a PR](#submit-a-pr)
- [Pull Request title](#pull-request-title)
Expand Down Expand Up @@ -53,5 +55,4 @@ You may also check out previous PRs in the [PR list](https://github.com/risingwa

### Sign the CLA

Contributors will need to sign Singularity Data's CLA.

Contributors will need to sign RisingWave Labs' CLA.
Loading

0 comments on commit 0f7bfa2

Please sign in to comment.