Merge remote-tracking branch 'origin/main' into bz/unified-query-log

risingwavelabs · Dec 18, 2023 · 0f92b6b · 0f92b6b
2 parents 0856ec9 + 942a826
commit 0f92b6b
Show file tree

Hide file tree

Showing 362 changed files with 9,756 additions and 4,735 deletions.
diff --git a/.config/hakari.toml b/.config/hakari.toml
@@ -41,4 +41,5 @@ third-party = [
     { name = "criterion" },
     { name = "console" },
     { name = "similar" },
+    { name = "deltalake", git = "https://github.com/risingwavelabs/delta-rs", rev = "5c2dccd4640490202ffe98adbd13b09cef8e007b" },
 ]
diff --git a/.github/workflows/cherry-pick-to-release-branch.yml b/.github/workflows/cherry-pick-to-release-branch.yml
@@ -6,6 +6,22 @@ on:
     types: ["closed", "labeled"]
 
 jobs:
+  release_pull_request_1_5_1:
+    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.5.1')  &&  github.event.pull_request.merged == true"
+    runs-on: ubuntu-latest
+    name: release_pull_request
+    steps:
+      - name: checkout
+        uses: actions/checkout@v1
+      - name: Create PR to branch
+        uses: risingwavelabs/github-action-cherry-pick@master
+        with:
+          pr_branch: 'v1.5.1-rc'
+          pr_labels: 'cherry-pick'
+          pr_body: ${{ format('Cherry picking \#{0} onto branch v1.5.1-rc', github.event.number) }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   release_pull_request_1_5_0:
     if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-v1.5.0')  &&  github.event.pull_request.merged == true"
     runs-on: ubuntu-latest