Skip to content

Commit 7f6c54b

Browse files
qevolgqevolg
committed
Merge branch 'main' into 3.0
2 parents 5d2f9ac + 651ca50 commit 7f6c54b

Some content is hidden

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

109 files changed

+2851
-2584
lines changed

‎.cargo/config.toml‎

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
[target.'cfg(all())']
2+
rustflags = [
3+
# Complexity Group
4+
"-Aclippy::manual_c_str_literals",
5+
6+
# Style Group
7+
"-Aclippy::missing_safety_doc",
8+
9+
# Suspicious Group
10+
"-Aclippy::missing_transmute_annotations",
11+
12+
# Cargo Group
13+
"-Wclippy::negative_feature_names",
14+
"-Wclippy::redundant_feature_names",
15+
"-Wclippy::wildcard_dependencies",
16+
17+
# Nursery Group
18+
"-Wclippy::branches_sharing_code",
19+
"-Wclippy::clear_with_drain",
20+
"-Wclippy::collection_is_never_read",
21+
"-Wclippy::debug_assert_with_mut_call",
22+
"-Wclippy::derive_partial_eq_without_eq",
23+
"-Wclippy::future_not_send",
24+
"-Wclippy::iter_on_empty_collections",
25+
"-Wclippy::iter_with_drain",
26+
"-Wclippy::large_stack_frames",
27+
"-Wclippy::mutex_integer",
28+
"-Wclippy::needless_collect",
29+
"-Wclippy::needless_pass_by_ref_mut",
30+
"-Wclippy::nonstandard_macro_braces",
31+
"-Wclippy::path_buf_push_overwrite",
32+
"-Wclippy::redundant_clone",
33+
"-Wclippy::redundant_pub_crate",
34+
"-Wclippy::set_contains_or_insert",
35+
"-Wclippy::significant_drop_in_scrutinee",
36+
"-Wclippy::string_lit_as_bytes",
37+
"-Wclippy::suspicious_operation_groupings",
38+
"-Wclippy::trailing_empty_array",
39+
"-Wclippy::trait_duplication_in_bounds",
40+
"-Wclippy::tuple_array_conversions",
41+
"-Wclippy::type_repetition_in_bounds",
42+
"-Wclippy::uninhabited_references",
43+
"-Wclippy::unnecessary_struct_initialization",
44+
"-Wclippy::unused_peekable",
45+
"-Wclippy::unused_rounding",
46+
"-Wclippy::useless_let_if_seq",
47+
"-Wclippy::while_float",
48+
49+
# Pedantic Group
50+
"-Wclippy::bool_to_int_with_if",
51+
"-Wclippy::checked_conversions",
52+
"-Wclippy::cloned_instead_of_copied",
53+
"-Wclippy::copy_iterator",
54+
"-Wclippy::default_trait_access",
55+
"-Wclippy::empty_enum",
56+
"-Wclippy::expl_impl_clone_on_copy",
57+
"-Wclippy::explicit_into_iter_loop",
58+
"-Wclippy::filter_map_next",
59+
"-Wclippy::flat_map_option",
60+
"-Wclippy::fn_params_excessive_bools",
61+
"-Wclippy::from_iter_instead_of_collect",
62+
"-Wclippy::implicit_clone",
63+
"-Wclippy::index_refutable_slice",
64+
"-Wclippy::inefficient_to_string",
65+
"-Wclippy::invalid_upcast_comparisons",
66+
"-Wclippy::iter_filter_is_ok",
67+
"-Wclippy::iter_filter_is_some",
68+
"-Wclippy::iter_not_returning_iterator",
69+
"-Wclippy::large_digit_groups",
70+
"-Wclippy::large_futures",
71+
"-Wclippy::large_stack_arrays",
72+
"-Wclippy::large_types_passed_by_value",
73+
"-Wclippy::linkedlist",
74+
"-Wclippy::macro_use_imports",
75+
"-Wclippy::manual_assert",
76+
"-Wclippy::manual_instant_elapsed",
77+
"-Wclippy::manual_is_variant_and",
78+
"-Wclippy::manual_ok_or",
79+
"-Wclippy::manual_string_new",
80+
"-Wclippy::many_single_char_names",
81+
"-Wclippy::map_unwrap_or",
82+
"-Wclippy::match_bool",
83+
"-Wclippy::match_on_vec_items",
84+
"-Wclippy::match_same_arms",
85+
"-Wclippy::match_wildcard_for_single_variants",
86+
"-Wclippy::maybe_infinite_iter",
87+
"-Wclippy::mismatching_type_param_order",
88+
"-Wclippy::missing_fields_in_debug",
89+
"-Wclippy::mut_mut",
90+
"-Wclippy::naive_bytecount",
91+
"-Wclippy::needless_bitwise_bool",
92+
"-Wclippy::needless_continue",
93+
"-Wclippy::needless_for_each",
94+
"-Wclippy::needless_raw_string_hashes",
95+
"-Wclippy::no_effect_underscore_binding",
96+
"-Wclippy::no_mangle_with_rust_abi",
97+
"-Wclippy::ref_option_ref",
98+
"-Wclippy::option_as_ref_cloned",
99+
"-Wclippy::pub_underscore_fields",
100+
"-Wclippy::range_minus_one",
101+
"-Wclippy::range_plus_one",
102+
"-Wclippy::redundant_else",
103+
"-Wclippy::ref_binding_to_reference",
104+
"-Wclippy::same_functions_in_if_condition",
105+
"-Wclippy::semicolon_if_nothing_returned",
106+
"-Wclippy::stable_sort_primitive",
107+
"-Wclippy::str_split_at_newline",
108+
"-Wclippy::string_add_assign",
109+
"-Wclippy::unchecked_duration_subtraction",
110+
"-Wclippy::unicode_not_nfc",
111+
"-Wclippy::uninlined_format_args",
112+
"-Wclippy::unnecessary_box_returns",
113+
"-Wclippy::unnested_or_patterns",
114+
"-Wclippy::unsafe_derive_deserialize",
115+
"-Wclippy::used_underscore_binding",
116+
"-Wclippy::verbose_bit_mask",
117+
"-Wclippy::zero_sized_map_values",
118+
119+
# Restriction Group
120+
"-Wclippy::alloc_instead_of_core",
121+
"-Wclippy::big_endian_bytes",
122+
"-Wclippy::cfg_not_test",
123+
"-Wclippy::dbg_macro",
124+
"-Wclippy::default_union_representation",
125+
"-Wclippy::empty_drop",
126+
"-Wclippy::empty_enum_variants_with_brackets",
127+
"-Wclippy::empty_structs_with_brackets",
128+
"-Wclippy::exit",
129+
"-Wclippy::filetype_is_file",
130+
"-Wclippy::float_cmp_const",
131+
"-Wclippy::fn_to_numeric_cast_any",
132+
"-Wclippy::get_unwrap",
133+
"-Wclippy::host_endian_bytes",
134+
"-Wclippy::impl_trait_in_params",
135+
"-Wclippy::infinite_loop",
136+
"-Wclippy::large_include_file",
137+
"-Wclippy::lossy_float_literal",
138+
"-Wclippy::missing_asserts_for_indexing",
139+
"-Wclippy::mixed_read_write_in_expression",
140+
"-Wclippy::modulo_arithmetic",
141+
"-Wclippy::multiple_inherent_impl",
142+
"-Wclippy::mutex_atomic",
143+
"-Wclippy::needless_raw_strings",
144+
"-Wclippy::pathbuf_init_then_push",
145+
"-Wclippy::partial_pub_fields",
146+
"-Wclippy::print_stderr",
147+
"-Wclippy::print_stdout",
148+
"-Wclippy::pub_without_shorthand",
149+
"-Wclippy::rc_buffer",
150+
"-Wclippy::rc_mutex",
151+
"-Wclippy::redundant_type_annotations",
152+
"-Wclippy::rest_pat_in_fully_bound_structs",
153+
"-Wclippy::separated_literal_suffix",
154+
"-Wclippy::string_lit_chars_any",
155+
"-Wclippy::string_slice",
156+
"-Wclippy::string_to_string",
157+
"-Wclippy::tests_outside_test_module",
158+
"-Wclippy::unnecessary_self_imports",
159+
"-Wclippy::unneeded_field_pattern",
160+
"-Wclippy::use_debug",
161+
"-Wclippy::verbose_file_reads",
162+
]

‎.github/scripts/cliff.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
2+
23
set -e
3-
git cliff --tag $(toml get ./Cargo.toml workspace.package.version |sed 's/"//g' | rg '\d+\.\d+\.\d+') -o CHANGELOG.md
4+
git cliff --tag $(toml get ./Cargo.toml workspace.package.version | sed 's/"//g' | rg '\d+\.\d+\.\d+') -o CHANGELOG.md
45
git add CHANGELOG.md
56
git commit -m "chore: add changelog for pre release"

‎.github/workflows/build.yml‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build
1+
name: Build
22

33
on:
44
push:
@@ -13,51 +13,52 @@ env:
1313
jobs:
1414
build:
1515
runs-on: ubuntu-latest
16-
1716
steps:
1817
- name: Step that prints name of pull request's base branch
18+
if: github.event_name == 'pull_request'
19+
env:
20+
BASE_BRANCH: ${{ github.base_ref }}
1921
run: |
2022
echo "Pull request's base branch is: ${BASE_BRANCH}"
2123
echo "Pull request's branch is: ${GITHUB_REF##*/}"
2224
echo "Pull request's head ref is: ${GITHUB_HEAD_REF}"
23-
env:
24-
BASE_BRANCH: ${{ github.base_ref }}
25-
if: github.event_name == 'pull_request'
2625
27-
- name: Checkout Connector
28-
uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2927

3028
- name: Set up Rust
3129
id: setup-rust
32-
uses: actions-rs/toolchain@v1
30+
uses: dtolnay/rust-toolchain@stable
3331
with:
34-
toolchain: stable
32+
components: clippy
3533

36-
- uses: actions/cache@v3
34+
- uses: actions/cache@v4
3735
id: cache-rust
3836
with:
3937
path: |
4038
~/.cargo/bin/
4139
~/.cargo/registry/index/
4240
~/.cargo/registry/cache/
4341
~/.cargo/git/db/
44-
key: ${{ runner.os }}-cargo-${{ steps.setup-rust.outputs.rustc_hash }}
42+
key: ${{ runner.os }}-cargo-${{ steps.setup-rust.outputs.cachekey }}
4543

46-
- uses: actions/cache@v3
44+
- uses: actions/cache@v4
4745
with:
48-
path: |
49-
target
50-
key: ${{ runner.os }}-taos-target-${{ steps.setup-rust.outputs.rustc_hash }}
46+
path: target
47+
key: ${{ runner.os }}-taos-target-${{ steps.setup-rust.outputs.cachekey }}
5148

52-
- run: |
49+
- name: Cargo Build
50+
run: |
5351
cargo build -p taos --no-default-features --features ws-rustls
5452
cargo build -p taos-ws-sys
5553
54+
- name: Run Clippy
55+
run: cargo clippy -- -D warnings
56+
5657
test:
5758
runs-on: ubuntu-latest
5859
steps:
59-
- name: Checkout tdengine
60-
uses: actions/checkout@v2
60+
- name: Checkout TDengine
61+
uses: actions/checkout@v4
6162
with:
6263
repository: "taosdata/TDengine"
6364
path: "TDengine"
@@ -79,16 +80,11 @@ jobs:
7980
mkdir release && cd release
8081
cmake .. -DBUILD_JDBC=false -DBUILD_HTTP=false -DWEBSOCKET=true -DVERNUMBER=3.9.9.9 -DBUILD_DEPENDENCY_TESTS=false
8182
82-
- name: Set up Go
83-
uses: actions/setup-go@v3
84-
with:
85-
go-version: 1.19
86-
- uses: actions/cache@v3
83+
- uses: actions/cache@v4
8784
id: cache-rust-target
8885
with:
89-
path: |
90-
TDengine/tools/taosws-rs/target/
91-
key: ${{ runner.os }}-cargo-target-${{ steps.setup-rust.outputs.rustc_hash }}
86+
path: TDengine/tools/taosws-rs/target/
87+
key: ${{ runner.os }}-cargo-target-${{ steps.setup-rust.outputs.cachekey }}
9288

9389
- name: Build & Install TDengine
9490
run: |

0 commit comments

Comments
 (0)