Skip to content

Commit 203ee29

Browse files
authored
Merge pull request RedisJSON#924 from RedisJSON/rafi-2.4-cp-2.4.4
[2.4] Cherry-picks from master; version 2.4.4
2 parents 7d91ab3 + e4fb82a commit 203ee29

25 files changed

+736
-635
lines changed

.circleci/config.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,16 @@ commands:
315315
--triggering_env << parameters.triggering_env >> \
316316
--push_results_redistimeseries \
317317
--allowed-envs << parameters.allowed_envs >> || true
318-
318+
- run:
319+
name: Generate Pull Request Performance info
320+
command: |
321+
if [[ -n ${CIRCLE_PULL_REQUEST##*/} ]]; then
322+
redisbench-admin compare \
323+
--defaults_filename ./tests/benchmarks/defaults.yml \
324+
--comparison-branch $CIRCLE_BRANCH \
325+
--auto-approve \
326+
--pull-request ${CIRCLE_PULL_REQUEST##*/}
327+
fi
319328
#----------------------------------------------------------------------------------------------------------------------------------
320329

321330
jobs:
@@ -368,7 +377,7 @@ jobs:
368377

369378
build-macos:
370379
macos:
371-
xcode: 11.7.0
380+
xcode: 12.5.1
372381
resource_class: macos.x86.medium.gen2
373382
parameters:
374383
upload:

.github/spellcheck-settings.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ matrix:
44
apsell:
55
lang: en
66
d: en_US
7+
ignore-case: true
78
dictionary:
89
wordlists:
910
- .github/wordlist.txt

.github/wordlist.txt

+3
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,16 @@ https
6161
io
6262
ioredis
6363
iorejson
64+
jedis
6465
js
6566
json
6667
lang
6768
md
6869
mkorkmaz
6970
nitishm
7071
npm
72+
nredisstack
73+
rustis
7174
nst
7275
nuget
7376
occurances

.github/workflows/spellcheck.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v2
1212
- name: Spellcheck
13-
uses: rojopolis/spellcheck-github-actions@0.26.0
13+
uses: rojopolis/spellcheck-github-actions@0.29.0
1414
with:
1515
config_path: .github/spellcheck-settings.yml
1616
task_name: Markdown

.github/workflows/trigger-benchmark.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ jobs:
3131
--header 'Circle-Token: ${{ secrets.CIRCLE_CI_SECRET }}' \
3232
--header 'content-type: application/json' \
3333
--data '{"branch": "${{ github.event.pull_request.head.ref }}",
34-
"parameters": {"run_default_flow":false, "run_benchmark_flow_label":true}}'
34+
"parameters": {"run_default_flow":true, "run_benchmark_flow_label":true}}'

Cargo.lock

+62-62
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)