Skip to content

Commit

Permalink
Merge branch 'main' into wcy/gcs_source
Browse files Browse the repository at this point in the history
  • Loading branch information
wcy-fdu authored Nov 27, 2023
2 parents 0ded6e0 + c247597 commit 8d5dc2c
Show file tree
Hide file tree
Showing 1,323 changed files with 45,578 additions and 19,175 deletions.
19 changes: 19 additions & 0 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,22 @@ fail-fast = false
[profile.ci.junit]
path = "junit-nextest.xml"
report-name = "nextest-run"

[test-groups]
failpoint-limited = { max-threads = 1 }

[[profile.default.overrides]]
filter = 'test(failpoint_limited::)'
test-group = 'failpoint-limited'

[[profile.ci.overrides]]
filter = 'test(failpoint_limited::)'
test-group = 'failpoint-limited'

[[profile.ci-sim.overrides]]
filter = 'test(failpoint_limited::)'
test-group = 'failpoint-limited'

[[profile.ci.junit.overrides]]
filter = 'test(failpoint_limited::)'
test-group = 'failpoint-limited'
5 changes: 4 additions & 1 deletion .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@ f8266748dcb70541da944664552c1944ff8362e4
f2a3fd021059e680b35b24c63cff5f8dbe9f9d5f

# chore(rustfmt): format let-chains and let-else #9409
d70dba827c303373f3220c9733f7c7443e5c2d37
d70dba827c303373f3220c9733f7c7443e5c2d37

# chore: cargo +nightly fmt (#13162) (format let-chains)
c583e2c6c054764249acf484438c7bf7197765f4
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,11 @@ updates:
patterns:
- "tonic*"
- "prost*"
opentelemetry:
patterns:
- "opentelemetry*"
- "tracing-opentelemetry"
mysql:
patterns:
- "mysql_common"
- "mysql_async"
1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Please explain **IN DETAIL** what the changes are in this PR and why they are ne

- [ ] I have written necessary rustdoc comments
- [ ] I have added necessary unit tests and integration tests
- [ ] I have added test labels as necessary. See [details](https://github.com/risingwavelabs/risingwave/blob/main/docs/developer-guide.md#ci-labels-guide).
- [ ] I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features #7934).
- [ ] My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
- [ ] All checks passed in `./risedev check` (or alias, `./risedev c`)
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/auto-create-doc-issue-by-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Log the event payload
run: echo "${{ toJSON(github.event) }}"
- name: Check if issue is done and labeled 'user-facing-changes'
uses: dacbd/create-issue-action@main
if: ${{ github.event.action == 'closed' && contains(github.event.issue.labels.*.name, 'user-facing-changes') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cherry-pick-to-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

release_pull_request_1_2:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.2') && github.event.pull_request.merged == true"
release_pull_request_1_4:
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.4') && github.event.pull_request.merged == true"
runs-on: ubuntu-latest
name: release_pull_request
steps:
Expand All @@ -32,9 +32,9 @@ jobs:
- name: Create PR to branch
uses: risingwavelabs/github-action-cherry-pick@master
with:
pr_branch: 'v1.2-rc'
pr_branch: 'v1.4-rc'
pr_labels: 'cherry-pick'
pr_body: ${{ format('Cherry picking \#{0} onto branch v1.2-rc', github.event.number) }}
pr_body: ${{ format('Cherry picking \#{0} onto branch v1.4-rc', github.event.number) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

7 changes: 4 additions & 3 deletions .github/workflows/dashboard_main.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
name: Dashboard (main)
on:
push:
branches: [ main ]
paths: [ dashboard/** ]
branches: [main]
paths: [dashboard/**, proto/**]
workflow_dispatch:
jobs:
dashboard-ui-deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: '18'
node-version: "18"
- uses: arduino/setup-protoc@v1
with:
version: "3.x"
Expand Down
Loading

0 comments on commit 8d5dc2c

Please sign in to comment.