Skip to content

Commit e3e14f3

Browse files
committed
Merge remote-tracking branch 'origin/main' into siyuan/pg-schema-event
2 parents 2e69a10 + 7920e3d commit e3e14f3

File tree

484 files changed

+9625
-25156
lines changed

Some content is hidden

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

484 files changed

+9625
-25156
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# regression test data
22
src/tests/regress/data/** linguist-vendored
33
# source test data
4-
scripts/source/test_data/** linguist-vendored
4+
e2e_test/source_legacy/basic/scripts/test_data/** linguist-vendored
55
# generated grafana dashboard
66
grafana/risingwave-dashboard.json linguist-generated

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,20 @@ jobs:
5555
env:
5656
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5757

58+
release_pull_request_2_1:
59+
if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-2.1') && github.event.pull_request.merged == true"
60+
runs-on: ubuntu-latest
61+
name: release_pull_request
62+
steps:
63+
- name: checkout
64+
uses: actions/checkout@v1
65+
- name: Create PR to branch
66+
uses: risingwavelabs/github-action-cherry-pick@master
67+
with:
68+
pr_branch: 'release-2.1'
69+
pr_labels: 'cherry-pick'
70+
pr_body: ${{ format('Cherry picking \#{0} onto branch release-2.1', github.event.number) }}
71+
env:
72+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
73+
5874
permissions: write-all

.github/workflows/dashboard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
node-version: 18
1818
- uses: arduino/setup-protoc@v3
1919
with:
20-
version: "3.x"
20+
version: "25.x"
2121
repo-token: ${{ secrets.GITHUB_TOKEN }}
2222
- name: build
2323
working-directory: ./dashboard

.typos.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,8 @@ extend-exclude = [
3737
# Ideally, we should just ignore that line: https://github.com/crate-ci/typos/issues/316
3838
"src/common/src/cast/mod.rs",
3939
"src/tests/simulation/tests/integration_tests/scale/shared_source.rs",
40-
"java/connector-node/risingwave-source-cdc/src/main/java/io/debezium/connector/postgresql/*.java",
40+
# We don't want to fix "Divy" here, but may want in other places.
41+
"integration_tests/deltalake-sink/spark-script/run-sql-file.sh",
42+
# These files are copied from debezium connector, we don't want to fix their typos
43+
"java/connector-node/risingwave-source-cdc/src/main/java/io/debezium/connector/postgresql/*.java"
4144
]

0 commit comments

Comments
 (0)