Skip to content

Commit

Permalink
Merge branch 'main' into xzhseh/feat-protobuf-any
Browse files Browse the repository at this point in the history
  • Loading branch information
xzhseh authored Oct 23, 2023
2 parents c4a4cb9 + 2563300 commit 314d8df
Show file tree
Hide file tree
Showing 1,134 changed files with 45,063 additions and 21,782 deletions.
3 changes: 3 additions & 0 deletions .config/hakari.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ workspace-members = [
]
third-party = [
{ name = "opendal" },
# For some reasons, tikv-jemalloc-sys would be compiled twice if being added into `workspace-hack`
{ name = "tikv-jemalloc-sys", git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" },
{ name = "tikv-jemallocator", git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" },
# These are solely dev-dependencies. Unifying them may slow down build.
{ name = "criterion" },
{ name = "console" },
Expand Down
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ f8266748dcb70541da944664552c1944ff8362e4

# feat(risedev): add check for trailing spaces in `risedev check` (#11294)
f2a3fd021059e680b35b24c63cff5f8dbe9f9d5f

# chore(rustfmt): format let-chains and let-else #9409
d70dba827c303373f3220c9733f7c7443e5c2d37
9 changes: 8 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ updates:
open-pull-requests-limit: 10
# Disable auto rebase to reduce cost. Use `@dependabot rebase` manually instead.
rebase-strategy: "disabled"

# Ignore patch to reduce spam. Manually run `cargo update` regularly instead.
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-patch"]
# Create a group of dependencies to be updated together in one pull request
groups:
arrow:
Expand All @@ -16,3 +19,7 @@ updates:
aws:
patterns:
- "aws*"
tonic:
patterns:
- "tonic*"
- "prost*"
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 @@ -6,8 +6,8 @@ on:
types: ["closed", "labeled"]

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

Expand Down
15 changes: 14 additions & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Maximize build space
uses: easimon/maximize-build-space@master
with:
remove-dotnet: 'true'
remove-android: 'true'
remove-haskell: 'true'
remove-codeql: 'true'
remove-docker-images: 'true'
root-reserve-mb: 10240
temp-reserve-mb: 10240
- uses: actions/checkout@v3
- name: Setup Rust toolchain
run: rustup show
Expand All @@ -30,6 +40,8 @@ jobs:
mkdir artifact
cp -R target/doc/* artifact
- name: Show available storage
run: df -h
- name: Install cargo-docset
uses: taiki-e/install-action@v2
with:
Expand All @@ -49,7 +61,8 @@ jobs:
uses: actions/upload-pages-artifact@v1
with:
path: artifact

- name: Show available storage
run: df -h
deploy:
needs: build
permissions:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/hakari_fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}

- name: Install cargo-hakari
uses: taiki-e/install-action@v2
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/nightly-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@ jobs:
remove-haskell: 'true'
remove-codeql: 'true'
remove-docker-images: 'true'
root-reserve-mb: 2048
- uses: actions/checkout@v3
if: ${{ github.event_name == 'schedule' }}
with:
# For daily scheduled run, we use a fixed branch, so that we can apply patches to fix compile errors earlier.
# We can also ensure the regression is due to new rust instead of new RisingWave code.
ref: xxchan/latest-nightly-rust
- uses: actions/checkout@v3
if: ${{ !(github.event_name == 'schedule') }}
- name: Setup Rust toolchain
run: |
rustup override set nightly
Expand Down
1 change: 1 addition & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ header:
- "**/*.d.ts"
- "src/sqlparser/**/*.rs"
- "java/connector-node/risingwave-source-cdc/src/main/java/com/risingwave/connector/cdc/debezium/internal/*.java"
- "src/meta/src/model_v2/migration/**/*.rs"

comment: on-failure
Loading

0 comments on commit 314d8df

Please sign in to comment.