Skip to content

Commit

Permalink
resolve so many conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
wcy-fdu committed Sep 18, 2023
2 parents d86b6a2 + b37a19c commit bb0688b
Show file tree
Hide file tree
Showing 954 changed files with 33,318 additions and 17,211 deletions.
22 changes: 3 additions & 19 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,7 @@ rustflags = [
# uncomment the following two lines to enable `TaskLocalAlloc`
# "--cfg",
# "enable_task_local_alloc",
# lints
# TODO: use lint configuration in cargo https://github.com/rust-lang/cargo/issues/5034
"-Funused_must_use",
"-Aclippy::uninlined_format_args",
"-Wclippy::dbg_macro",
"-Wclippy::disallowed_methods",
"-Wclippy::disallowed_types",
"-Wclippy::doc_markdown",
"-Wclippy::explicit_into_iter_loop",
"-Wclippy::explicit_iter_loop",
"-Wclippy::inconsistent_struct_constructor",
"-Wclippy::unused_async",
"-Wclippy::map_flatten",
"-Wclippy::no_effect_underscore_binding",
"-Wclippy::await_holding_lock",
"-Wrustdoc::broken_intra_doc_links",
"-Wfuture_incompatible",
"-Wnonstandard_style",
"-Wrust_2018_idioms",
]

[unstable]
lints = true
3 changes: 2 additions & 1 deletion .config/hakari.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ resolver = "2"
# https://doc.rust-lang.org/rustc/platform-support.html
platforms = [
# "x86_64-unknown-linux-gnu",
# "aarch64-unknown-linux-gnu",
# "x86_64-apple-darwin",
# "x86_64-pc-windows-msvc",
# "aarch64-apple-darwin",
]

# Write out exact versions rather than a semver range. (Defaults to false.)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cherry-pick-to-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
branches:
- main
types: ["closed"]
types: ["closed", "labeled"]

jobs:
release_pull_request_1_1:
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/nightly-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,23 @@ 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'
- uses: actions/checkout@v3
- name: Setup Rust toolchain
run: |
rustup override set nightly
rustup update nightly
- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y make build-essential cmake protobuf-compiler curl openssl libssl-dev libsasl2-dev libcurl4-openssl-dev pkg-config postgresql-client tmux lld
- name: cargo build
- name: cargo check
run: |
cargo build
export CARGO_INCREMENTAL=0
export CARGO_PROFILE_DEV_DEBUG=false
cargo check
17 changes: 16 additions & 1 deletion .vscode/launch.json.example
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,21 @@
],
"cwd": "${workspaceRoot}",
"preLaunchTask": "build rw bin"
},
{
"name": "Open playground coredump",
"type": "lldb",
"request": "custom",
"targetCreateCommands": [
"target create ${workspaceFolder}/target/debug/risingwave --core ${input:coreFileName}"
],
}
],
"inputs": [
{
"id": "coreFileName",
"type": "promptString",
"description": "Enter core file path"
}
]
}
}
Loading

0 comments on commit bb0688b

Please sign in to comment.