Skip to content

Commit 9bf4913

Browse files
committed
Merge branch 'main' into wrj/variadic
2 parents 443181e + 6a8fa2b commit 9bf4913

File tree

1,390 files changed

+51704
-27348
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,390 files changed

+51704
-27348
lines changed

.github/dependabot.yml

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ updates:
2626
- "prost*"
2727
opentelemetry:
2828
patterns:
29+
- "opentelemetry"
2930
- "opentelemetry*"
3031
- "tracing-opentelemetry"
3132
mysql:

.github/workflows/cherry-pick-to-release-branch.yml

+21-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
pull_request:
44
branches:
55
- main
6-
types: ["closed"]
6+
types: ["closed", "labeled"]
77

88
jobs:
9-
release_pull_request_1_5:
10-
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.5') && github.event.pull_request.merged == true"
9+
release_pull_request_1_7_standalone:
10+
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.7-standalone') && github.event.pull_request.merged == true"
1111
runs-on: ubuntu-latest
1212
name: release_pull_request
1313
steps:
@@ -16,9 +16,25 @@ jobs:
1616
- name: Create PR to branch
1717
uses: risingwavelabs/github-action-cherry-pick@master
1818
with:
19-
pr_branch: 'release-1.5'
19+
pr_branch: 'release-1.7.0-standalone'
2020
pr_labels: 'cherry-pick'
21-
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.5', github.event.number) }}
21+
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.7.0-standalone', github.event.number) }}
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
25+
release_pull_request_1_7:
26+
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.7') && github.event.pull_request.merged == true"
27+
runs-on: ubuntu-latest
28+
name: release_pull_request
29+
steps:
30+
- name: checkout
31+
uses: actions/checkout@v1
32+
- name: Create PR to branch
33+
uses: risingwavelabs/github-action-cherry-pick@master
34+
with:
35+
pr_branch: 'release-1.7'
36+
pr_labels: 'cherry-pick'
37+
pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.7', github.event.number) }}
2238
env:
2339
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2440

.licenserc.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ header:
1717
- "**/*.d.ts"
1818
- "src/sqlparser/**/*.rs"
1919
- "java/connector-node/risingwave-source-cdc/src/main/java/com/risingwave/connector/cdc/debezium/internal/*.java"
20+
- "java/connector-node/risingwave-sink-iceberg/src/main/java/org/apache/iceberg/**/*.java"
2021
- "src/meta/model_v2/migration/**/*.rs"
2122
- "lints/ui/**"
2223

0 commit comments

Comments
 (0)