Skip to content

Commit d57fbac

Browse files
ndyakovndyakov
authored
Merge branch 'master' into 2276-stream-context-tests
2 parents 4d4a657 + cb3aa19 commit d57fbac

File tree

173 files changed

+31907
-5034
lines changed

Some content is hidden

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

173 files changed

+31907
-5034
lines changed

‎.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
doctests/* @dmaier-redislabs

‎.github/actions/run-tests/action.yml

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: 'Run go-redis tests'
2+
description: 'Runs go-redis tests against different Redis versions and configurations'
3+
inputs:
4+
go-version:
5+
description: 'Go version to use for running tests'
6+
default: '1.23'
7+
redis-version:
8+
description: 'Redis version to test against'
9+
required: true
10+
runs:
11+
using: "composite"
12+
steps:
13+
- name: Set up ${{ inputs.go-version }}
14+
uses: actions/setup-go@v5
15+
with:
16+
go-version: ${{ inputs.go-version }}
17+
18+
- name: Setup Test environment
19+
env:
20+
REDIS_VERSION: ${{ inputs.redis-version }}
21+
CLIENT_LIBS_TEST_IMAGE: "redislabs/client-libs-test:${{ inputs.redis-version }}"
22+
run: |
23+
set -e
24+
redis_version_np=$(echo "$REDIS_VERSION" | grep -oP '^\d+.\d+')
25+
26+
# Mapping of redis version to redis testing containers
27+
declare -A redis_version_mapping=(
28+
["8.0-M05"]="8.0-M05-pre"
29+
["7.4.2"]="rs-7.4.0-v2"
30+
["7.2.7"]="rs-7.2.0-v14"
31+
)
32+
33+
if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
34+
echo "REDIS_VERSION=${redis_version_np}" >> $GITHUB_ENV
35+
echo "REDIS_IMAGE=redis:${{ inputs.redis-version }}" >> $GITHUB_ENV
36+
echo "CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test:${redis_version_mapping[$REDIS_VERSION]}" >> $GITHUB_ENV
37+
else
38+
echo "Version not found in the mapping."
39+
exit 1
40+
fi
41+
sleep 10 # wait for redis to start
42+
shell: bash
43+
- name: Set up Docker Compose environment with redis ${{ inputs.redis-version }}
44+
run: |
45+
make docker.start
46+
shell: bash
47+
- name: Run tests
48+
env:
49+
RCE_DOCKER: "true"
50+
RE_CLUSTER: "false"
51+
run: |
52+
make test.ci
53+
shell: bash

‎.github/spellcheck-settings.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
matrix:
2+
- name: Markdown
3+
expect_match: false
4+
apsell:
5+
lang: en
6+
d: en_US
7+
ignore-case: true
8+
dictionary:
9+
wordlists:
10+
- .github/wordlist.txt
11+
output: wordlist.dic
12+
pipeline:
13+
- pyspelling.filters.markdown:
14+
markdown_extensions:
15+
- markdown.extensions.extra:
16+
- pyspelling.filters.html:
17+
comments: false
18+
attributes:
19+
- alt
20+
ignores:
21+
- ':matches(code, pre)'
22+
- code
23+
- pre
24+
- blockquote
25+
- img
26+
sources:
27+
- 'README.md'
28+
- 'FAQ.md'
29+
- 'docs/**'

‎.github/wordlist.txt

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
ACLs
2+
APIs
3+
autoload
4+
autoloader
5+
autoloading
6+
analytics
7+
Autoloading
8+
backend
9+
backends
10+
behaviour
11+
CAS
12+
ClickHouse
13+
config
14+
customizable
15+
Customizable
16+
dataset
17+
de
18+
DisableIdentity
19+
ElastiCache
20+
extensibility
21+
FPM
22+
Golang
23+
IANA
24+
keyspace
25+
keyspaces
26+
Kvrocks
27+
localhost
28+
Lua
29+
MSSQL
30+
namespace
31+
NoSQL
32+
OpenTelemetry
33+
ORM
34+
Packagist
35+
PhpRedis
36+
pipelining
37+
pluggable
38+
Predis
39+
PSR
40+
Quickstart
41+
README
42+
rebalanced
43+
rebalancing
44+
redis
45+
Redis
46+
RocksDB
47+
runtime
48+
SHA
49+
sharding
50+
SETNAME
51+
SpellCheck
52+
SSL
53+
struct
54+
stunnel
55+
SynDump
56+
TCP
57+
TLS
58+
UnstableResp
59+
uri
60+
URI
61+
url
62+
variadic
63+
RedisStack
64+
RedisGears
65+
RedisTimeseries
66+
RediSearch
67+
RawResult
68+
RawVal

‎.github/workflows/build.yml

+75-17
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,96 @@ name: Go
22

33
on:
44
push:
5-
branches: [master, v9]
5+
branches: [master, v9, v9.7]
66
pull_request:
7-
branches: [master, v9]
7+
branches: [master, v9, v9.7]
88

99
permissions:
1010
contents: read
1111

1212
jobs:
13-
build:
14-
name: build
13+
14+
benchmark:
15+
name: benchmark
1516
runs-on: ubuntu-latest
1617
strategy:
1718
fail-fast: false
1819
matrix:
19-
go-version: [1.18.x, 1.19.x]
20-
21-
services:
22-
redis:
23-
image: redis
24-
options: >-
25-
--health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
26-
ports:
27-
- 6379:6379
20+
redis-version:
21+
- "8.0-M05" # 8.0 milestone 5
22+
- "7.4.2" # should use redis stack 7.4
23+
go-version:
24+
- "1.23.x"
25+
- "1.24.x"
2826

2927
steps:
3028
- name: Set up ${{ matrix.go-version }}
31-
uses: actions/setup-go@v3
29+
uses: actions/setup-go@v5
3230
with:
3331
go-version: ${{ matrix.go-version }}
3432

3533
- name: Checkout code
36-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
35+
36+
- name: Setup Test environment
37+
env:
38+
REDIS_VERSION: ${{ matrix.redis-version }}
39+
CLIENT_LIBS_TEST_IMAGE: "redislabs/client-libs-test:${{ matrix.redis-version }}"
40+
run: |
41+
set -e
42+
redis_version_np=$(echo "$REDIS_VERSION" | grep -oP '^\d+.\d+')
43+
44+
# Mapping of redis version to redis testing containers
45+
declare -A redis_version_mapping=(
46+
["8.0-M05"]="8.0-M05-pre"
47+
["7.4.2"]="rs-7.4.0-v2"
48+
)
49+
if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
50+
echo "REDIS_VERSION=${redis_version_np}" >> $GITHUB_ENV
51+
echo "REDIS_IMAGE=redis:${{ matrix.redis-version }}" >> $GITHUB_ENV
52+
echo "CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test:${redis_version_mapping[$REDIS_VERSION]}" >> $GITHUB_ENV
53+
else
54+
echo "Version not found in the mapping."
55+
exit 1
56+
fi
57+
shell: bash
58+
- name: Set up Docker Compose environment with redis ${{ matrix.redis-version }}
59+
run: make docker.start
60+
shell: bash
61+
- name: Benchmark Tests
62+
env:
63+
RCE_DOCKER: "true"
64+
RE_CLUSTER: "false"
65+
run: make bench
66+
shell: bash
67+
68+
test-redis-ce:
69+
name: test-redis-ce
70+
runs-on: ubuntu-latest
71+
strategy:
72+
fail-fast: false
73+
matrix:
74+
redis-version:
75+
- "8.0-M05" # 8.0 milestone 5
76+
- "7.4.2" # should use redis stack 7.4
77+
- "7.2.7" # should redis stack 7.2
78+
go-version:
79+
- "1.23.x"
80+
- "1.24.x"
81+
82+
steps:
83+
- name: Checkout code
84+
uses: actions/checkout@v4
85+
86+
- name: Run tests
87+
uses: ./.github/actions/run-tests
88+
with:
89+
go-version: ${{matrix.go-version}}
90+
redis-version: ${{ matrix.redis-version }}
91+
92+
- name: Upload to Codecov
93+
uses: codecov/codecov-action@v5
94+
with:
95+
files: coverage.txt
96+
token: ${{ secrets.CODECOV_TOKEN }}
3797

38-
- name: Test
39-
run: make test

‎.github/workflows/codeql-analysis.yml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ master ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ master ]
20+
21+
jobs:
22+
analyze:
23+
name: Analyze
24+
runs-on: ubuntu-latest
25+
permissions:
26+
actions: read
27+
contents: read
28+
security-events: write
29+
30+
strategy:
31+
fail-fast: false
32+
matrix:
33+
language: [ 'go' ]
34+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
35+
# Learn more about CodeQL language support at https://git.io/codeql-language-support
36+
37+
steps:
38+
- name: Checkout repository
39+
uses: actions/checkout@v4
40+
41+
# Initializes the CodeQL tools for scanning.
42+
- name: Initialize CodeQL
43+
uses: github/codeql-action/init@v3
44+
with:
45+
languages: ${{ matrix.language }}
46+
# If you wish to specify custom queries, you can do so here or in a config file.
47+
# By default, queries listed here will override any specified in a config file.
48+
# Prefix the list here with "+" to use these queries and those in the config file.
49+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
50+
51+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
52+
# If this step fails, then you should remove it and run the build manually (see below)
53+
- name: Autobuild
54+
uses: github/codeql-action/autobuild@v3
55+
56+
# ℹ️ Command-line programs to run using the OS shell.
57+
# 📚 https://git.io/JvXDl
58+
59+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
60+
# and modify them (or add more) to build your code if your project
61+
# uses a compiled language
62+
63+
#- run: |
64+
# make bootstrap
65+
# make release
66+
67+
- name: Perform CodeQL Analysis
68+
uses: github/codeql-action/analyze@v3

‎.github/workflows/doctests.yaml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Documentation Tests
2+
3+
on:
4+
push:
5+
branches: [master, examples]
6+
pull_request:
7+
branches: [master, examples]
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
doctests:
14+
name: doctests
15+
runs-on: ubuntu-latest
16+
17+
services:
18+
redis-stack:
19+
image: redis/redis-stack-server:latest
20+
options: >-
21+
--health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
22+
ports:
23+
- 6379:6379
24+
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
go-version: ["1.24"]
29+
30+
steps:
31+
- name: Set up ${{ matrix.go-version }}
32+
uses: actions/setup-go@v5
33+
with:
34+
go-version: ${{ matrix.go-version }}
35+
36+
- name: Checkout code
37+
uses: actions/checkout@v4
38+
39+
- name: Test doc examples
40+
working-directory: ./doctests
41+
run: go test -v

0 commit comments

Comments
 (0)