Skip to content

Commit cefa7c0

Browse files
authored
Merge branch 'master' into master
2 parents 3c6a81d + 80c9f5b commit cefa7c0

File tree

150 files changed

+26110
-5297
lines changed

Some content is hidden

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

150 files changed

+26110
-5297
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
doctests/* @dmaier-redislabs

.github/spellcheck-settings.yml

Lines changed: 29 additions & 0 deletions
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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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+
ORM
33+
Packagist
34+
PhpRedis
35+
pipelining
36+
pluggable
37+
Predis
38+
PSR
39+
Quickstart
40+
README
41+
rebalanced
42+
rebalancing
43+
redis
44+
Redis
45+
RocksDB
46+
runtime
47+
SHA
48+
sharding
49+
SETNAME
50+
SpellCheck
51+
SSL
52+
struct
53+
stunnel
54+
SynDump
55+
TCP
56+
TLS
57+
uri
58+
URI
59+
url
60+
variadic
61+
RedisStack
62+
RedisGears
63+
RedisTimeseries
64+
RediSearch

.github/workflows/build.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,30 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
go-version: [1.18.x, 1.19.x]
19+
go-version: [1.19.x, 1.20.x, 1.21.x]
2020

2121
services:
2222
redis:
23-
image: redis
23+
image: redis/redis-stack-server:latest
2424
options: >-
2525
--health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
2626
ports:
2727
- 6379:6379
2828

2929
steps:
3030
- name: Set up ${{ matrix.go-version }}
31-
uses: actions/setup-go@v3
31+
uses: actions/setup-go@v5
3232
with:
3333
go-version: ${{ matrix.go-version }}
3434

3535
- name: Checkout code
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737

3838
- name: Test
3939
run: make test
40+
41+
- name: Upload to Codecov
42+
uses: codecov/codecov-action@v4
43+
with:
44+
files: coverage.txt
45+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/doctests.yaml

Lines changed: 41 additions & 0 deletions
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.18", "1.19", "1.20", "1.21" ]
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

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ jobs:
2121
name: lint
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
- name: golangci-lint
26-
uses: golangci/golangci-lint-action@v3
26+
uses: golangci/golangci-lint-action@v6

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
# Drafts your next Release notes as Pull Requests are merged into "master"
19-
- uses: release-drafter/release-drafter@v5
19+
- uses: release-drafter/release-drafter@v6
2020
with:
2121
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
2222
config-name: release-drafter-config.yml

.github/workflows/spellcheck.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: spellcheck
2+
on:
3+
pull_request:
4+
jobs:
5+
check-spelling:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- name: Checkout
9+
uses: actions/checkout@v4
10+
- name: Check Spelling
11+
uses: rojopolis/[email protected]
12+
with:
13+
config_path: .github/spellcheck-settings.yml
14+
task_name: Markdown

.github/workflows/stale-issues.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: "Close stale issues"
2+
on:
3+
schedule:
4+
- cron: "0 0 * * *"
5+
6+
permissions: {}
7+
jobs:
8+
stale:
9+
permissions:
10+
issues: write # to close stale issues (actions/stale)
11+
pull-requests: write # to close stale PRs (actions/stale)
12+
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/stale@v9
16+
with:
17+
repo-token: ${{ secrets.GITHUB_TOKEN }}
18+
stale-issue-message: 'This issue is marked stale. It will be closed in 30 days if it is not updated.'
19+
stale-pr-message: 'This pull request is marked stale. It will be closed in 30 days if it is not updated.'
20+
days-before-stale: 365
21+
days-before-close: 30
22+
stale-issue-label: "Stale"
23+
stale-pr-label: "Stale"
24+
operations-per-run: 10
25+
remove-stale-when-updated: true
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: RE Tests
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
build:
13+
name: build
14+
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
go-version: [1.21.x]
19+
re-build: ["7.4.2-54"]
20+
21+
steps:
22+
- name: Checkout code
23+
uses: actions/checkout@v4
24+
25+
- name: Clone Redis EE docker repository
26+
uses: actions/checkout@v4
27+
with:
28+
repository: RedisLabs/redis-ee-docker
29+
path: redis-ee
30+
31+
- name: Set up ${{ matrix.go-version }}
32+
uses: actions/setup-go@v5
33+
with:
34+
go-version: ${{ matrix.go-version }}
35+
36+
- name: Build cluster
37+
working-directory: redis-ee
38+
env:
39+
IMAGE: "redislabs/redis:${{ matrix.re-build }}"
40+
RE_USERNAME: [email protected]
41+
RE_PASS: 12345
42+
RE_CLUSTER_NAME: re-test
43+
RE_USE_OSS_CLUSTER: false
44+
RE_DB_PORT: 6379
45+
run: ./build.sh
46+
47+
- name: Test
48+
env:
49+
RE_CLUSTER: "1"
50+
run: |
51+
go test \
52+
--ginkgo.skip-file="ring_test.go" \
53+
--ginkgo.skip-file="sentinel_test.go" \
54+
--ginkgo.skip-file="osscluster_test.go" \
55+
--ginkgo.skip-file="pubsub_test.go" \
56+
--ginkgo.skip-file="gears_commands_test.go" \
57+
--ginkgo.label-filter='!NonRedisEnterprise'

0 commit comments

Comments
 (0)