Skip to content

Commit bb4f773

Browse files
oshadmioshadmi
committed
Merge remote-tracking branch 'origin/master' into release-v2.6.1
2 parents 3494577 + 8f89d53 commit bb4f773

Some content is hidden

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

56 files changed

+1604
-517
lines changed

‎.circleci/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ jobs:
440440

441441
sanitize:
442442
docker:
443-
- image: redisfab/clang:13-x64-bullseye
443+
- image: redisfab/clang:16-x64-focal
444444
parameters:
445445
san-type:
446446
type: string
@@ -451,7 +451,7 @@ jobs:
451451
- run:
452452
name: Build & test
453453
shell: /bin/bash -l -eo pipefail
454-
command: make SAN=<<parameters.san-type>> build test SHOW=1 VERBOSE=1
454+
command: make SAN=<<parameters.san-type>> build test SHOW=1
455455
no_output_timeout: 30m
456456
- save-tests-logs
457457

@@ -672,7 +672,7 @@ workflows:
672672
name: build-with-redis-<<matrix.redis_version>>
673673
matrix:
674674
parameters:
675-
redis_version: ["6.0", "6.2", "7.0", "7.2-rc1", "unstable"]
675+
redis_version: ["6.0", "6.2", "7.0", "7.2-rc2", "unstable"]
676676

677677
nightly-perf-once-a-week:
678678
triggers:

‎.github/wordlist.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
AGPLv
2+
Akber
23
CMake
34
CTO
45
Campoy
@@ -38,17 +39,20 @@ RedisJSON
3839
RedisJSON's
3940
RnD
4041
Rueian
42+
Saifee
4143
SETSCHEMA
4244
SSPLv
4345
TBD
4446
TODOs
4547
Tseitlin
4648
Vachhani
4749
YAML
50+
alisaifee
4851
allocator
4952
averias
5053
callgrind
5154
configureable
55+
coredis
5256
danitseitlin
5357
del
5458
dengliming

‎.github/workflows/freebsd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
. $HOME/.cargo/env
2828
rustup target add i686-unknown-freebsd
2929
cargo build --all --all-targets --verbose --target i686-unknown-freebsd
30-
cargo test --features test --all --all-targets --verbose
30+
cargo test --all --all-targets --verbose

‎.github/workflows/macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
- name: Build
1717
run: cargo build --all --all-targets --verbose
1818
- name: Run tests
19-
run: cargo test --features test --all --all-targets --verbose
19+
run: cargo test --all --all-targets --verbose

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/bin/
22
/target/
3+
/json_path/target/
34
/tests/pytest/logs/
45
/1/
56

0 commit comments

Comments
 (0)