Skip to content

Commit 4c7e4b9

Browse files
JohnSullyJohnSully
committed
Merge tag '6.0.8' into unstable
2 parents 28183f4 + 03b59cd commit 4c7e4b9

Some content is hidden

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

96 files changed

+4099
-1037
lines changed

‎.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
test-ubuntu-latest:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v1
10+
- uses: actions/checkout@v2
1111
- name: make
1212
run: |
1313
sudo apt-get update
@@ -42,14 +42,14 @@ jobs:
4242
build-macos-latest:
4343
runs-on: macos-latest
4444
steps:
45-
- uses: actions/checkout@v1
45+
- uses: actions/checkout@v2
4646
- name: make
4747
run: make -j2
4848

4949
build-libc-malloc:
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@v1
52+
- uses: actions/checkout@v2
5353
- name: make
5454
run: |
5555
sudo apt-get update

‎.github/workflows/daily.yml

Lines changed: 100 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
name: Daily
22

33
on:
4+
pull_request:
5+
branches:
6+
# any PR to a release branch.
7+
- '[0-9].[0-9]'
48
schedule:
5-
- cron: '0 7 * * *'
9+
- cron: '0 0 * * *'
610

711
jobs:
812

9-
test-jemalloc:
13+
test-ubuntu-jemalloc:
1014
runs-on: ubuntu-latest
11-
timeout-minutes: 1200
15+
if: github.repository == 'redis/redis'
16+
timeout-minutes: 14400
1217
steps:
13-
- uses: actions/checkout@v1
18+
- uses: actions/checkout@v2
1419
- name: make
1520
run: |
1621
sudo apt-get -y install uuid-dev libcurl4-openssl-dev
@@ -21,12 +26,17 @@ jobs:
2126
./runtest --accurate --verbose
2227
- name: module api test
2328
run: ./runtest-moduleapi --verbose
29+
- name: sentinel tests
30+
run: ./runtest-sentinel
31+
- name: cluster tests
32+
run: ./runtest-cluster
2433

25-
test-libc-malloc:
34+
test-ubuntu-libc-malloc:
2635
runs-on: ubuntu-latest
27-
timeout-minutes: 1200
36+
if: github.repository == 'redis/redis'
37+
timeout-minutes: 14400
2838
steps:
29-
- uses: actions/checkout@v1
39+
- uses: actions/checkout@v2
3040
- name: make
3141
run: |
3242
sudo apt-get -y install uuid-dev libcurl4-openssl-dev
@@ -37,11 +47,17 @@ jobs:
3747
./runtest --accurate --verbose
3848
- name: module api test
3949
run: ./runtest-moduleapi --verbose
50+
- name: sentinel tests
51+
run: ./runtest-sentinel
52+
- name: cluster tests
53+
run: ./runtest-cluster
4054

4155
test:
4256
runs-on: ubuntu-latest
57+
if: github.repository == 'redis/redis'
58+
timeout-minutes: 14400
4359
steps:
44-
- uses: actions/checkout@v1
60+
- uses: actions/checkout@v2
4561
- name: make
4662
run: |
4763
sudo apt-get -y install uuid-dev libcurl4-openssl-dev
@@ -59,7 +75,7 @@ jobs:
5975
test-ubuntu-arm:
6076
runs-on: [self-hosted, linux, arm]
6177
steps:
62-
- uses: actions/checkout@v1
78+
- uses: actions/checkout@v2
6379
- name: make
6480
run: |
6581
sudo apt-get -y install uuid-dev libcurl4-openssl-dev
@@ -74,9 +90,10 @@ jobs:
7490
7591
test-valgrind:
7692
runs-on: ubuntu-latest
93+
if: github.repository == 'redis/redis'
7794
timeout-minutes: 14400
7895
steps:
79-
- uses: actions/checkout@v1
96+
- uses: actions/checkout@v2
8097
- name: make
8198
run: |
8299
sudo apt-get -y install uuid-dev libcurl4-openssl-dev
@@ -87,3 +104,76 @@ jobs:
87104
./runtest --valgrind --verbose --clients 1
88105
- name: module api test
89106
run: ./runtest-moduleapi --valgrind --verbose --clients 1
107+
108+
test-centos7-jemalloc:
109+
runs-on: ubuntu-latest
110+
if: github.repository == 'redis/redis'
111+
container: centos:7
112+
timeout-minutes: 14400
113+
steps:
114+
- uses: actions/checkout@v2
115+
- name: make
116+
run: |
117+
yum -y install centos-release-scl
118+
yum -y install devtoolset-7
119+
scl enable devtoolset-7 "make"
120+
- name: test
121+
run: |
122+
yum -y install tcl
123+
./runtest --accurate --verbose
124+
- name: module api test
125+
run: ./runtest-moduleapi --verbose
126+
- name: sentinel tests
127+
run: ./runtest-sentinel
128+
- name: cluster tests
129+
run: ./runtest-cluster
130+
131+
test-centos7-tls:
132+
runs-on: ubuntu-latest
133+
if: github.repository == 'redis/redis'
134+
container: centos:7
135+
timeout-minutes: 14400
136+
steps:
137+
- uses: actions/checkout@v2
138+
- name: make
139+
run: |
140+
yum -y install centos-release-scl epel-release
141+
yum -y install devtoolset-7 openssl-devel openssl
142+
scl enable devtoolset-7 "make BUILD_TLS=yes"
143+
- name: test
144+
run: |
145+
yum -y install tcl tcltls
146+
./utils/gen-test-certs.sh
147+
./runtest --accurate --verbose --tls
148+
./runtest --accurate --verbose
149+
- name: module api test
150+
run: |
151+
./runtest-moduleapi --verbose --tls
152+
./runtest-moduleapi --verbose
153+
- name: sentinel tests
154+
run: |
155+
./runtest-sentinel --tls
156+
./runtest-sentinel
157+
- name: cluster tests
158+
run: |
159+
./runtest-cluster --tls
160+
./runtest-cluster
161+
162+
test-macos-latest:
163+
runs-on: macos-latest
164+
if: github.repository == 'redis/redis'
165+
timeout-minutes: 14400
166+
steps:
167+
- uses: actions/checkout@v2
168+
- name: make
169+
run: make
170+
- name: test
171+
run: |
172+
./runtest --accurate --verbose
173+
- name: module api test
174+
run: ./runtest-moduleapi --verbose
175+
- name: sentinel tests
176+
run: ./runtest-sentinel
177+
- name: cluster tests
178+
run: ./runtest-cluster
179+

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,13 @@ src/nodes.conf
4848
deps/lua/src/lua
4949
deps/lua/src/luac
5050
deps/lua/src/liblua.a
51+
tests/tls/*
5152
.make-*
5253
.prerequisites
5354
*.dSYM
5455
Makefile.dep
5556
.vscode/*
5657
.idea/*
58+
.ccls
59+
.ccls-cache/*
60+
compile_commands.json

0 commit comments

Comments
 (0)