yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4056 from emqx/dev/v4.3.0 

Auto-pull-request-on-2021-01-22
This commit is contained in:
Zaiming Shi 2021-01-22 21:41:06 +01:00 committed by GitHub
parent 8e94d75911 2c03bca6ae
commit 84e922205b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.ci/compatibility_tests/docker-compose-redis-singer-tls.yaml → .ci/compatibility_tests/docker-compose-redis-single-tls.yaml
View File

0
.ci/compatibility_tests/docker-compose-redis-singer.yaml → .ci/compatibility_tests/docker-compose-redis-single.yaml
View File

8
.github/workflows/run_cts_tests.yaml vendored
View File

@ -251,7 +251,7 @@ jobs:
- tls - tls
- tcp - tcp
node_type: node_type:
- singer - single
- cluster - cluster
steps: steps:
@ -281,12 +281,12 @@ jobs:
echo "redis_ipv4_address=$ipv4_address" >> $GITHUB_ENV echo "redis_ipv4_address=$ipv4_address" >> $GITHUB_ENV
echo "redis_ipv6_address=$ipv6_address" >> $GITHUB_ENV echo "redis_ipv6_address=$ipv6_address" >> $GITHUB_ENV
- name: setup - name: setup
if: matrix.node_type == 'singer' && matrix.connect_type == 'tcp' if: matrix.node_type == 'single' && matrix.connect_type == 'tcp'
run: | run: |
set -exu set -exu
sed -i "s|^[#[:space:]]*auth.redis.server[[:space:]]*=.*|auth.redis.server = \"${redis_${{ matrix.network_type }}_address}:6379\"|g" apps/emqx_auth_redis/etc/emqx_auth_redis.conf sed -i "s|^[#[:space:]]*auth.redis.server[[:space:]]*=.*|auth.redis.server = \"${redis_${{ matrix.network_type }}_address}:6379\"|g" apps/emqx_auth_redis/etc/emqx_auth_redis.conf
- name: setup - name: setup
if: matrix.node_type == 'singer' && matrix.connect_type == 'tls' && matrix.redis_tag != '5' if: matrix.node_type == 'single' && matrix.connect_type == 'tls' && matrix.redis_tag != '5'
run: | run: |
set -exu set -exu
sed -i "s|^[#[:space:]]*auth.redis.server[[:space:]]*=.*|auth.redis.server = \"${redis_${{ matrix.network_type }}_address}:6380\"|g" apps/emqx_auth_redis/etc/emqx_auth_redis.conf sed -i "s|^[#[:space:]]*auth.redis.server[[:space:]]*=.*|auth.redis.server = \"${redis_${{ matrix.network_type }}_address}:6380\"|g" apps/emqx_auth_redis/etc/emqx_auth_redis.conf
@ -313,5 +313,3 @@ jobs:
with: with:
name: logs_redis${{ matrix.redis_tag }}_${{ matrix.node_type }}_${{ matrix.network_type }}_${{ matrix.connect_type }} name: logs_redis${{ matrix.redis_tag }}_${{ matrix.node_type }}_${{ matrix.network_type }}_${{ matrix.connect_type }}
path: _build/test/logs path: _build/test/logs

2
.tool-versions
View File

@ -1 +1 @@
erlang 22.3.4.13 erlang 23.2.2

2
apps/emqx_auth_jwt/rebar.config
View File

@ -1,6 +1,6 @@
{deps, {deps,
[ [
{jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.10.1"}}} {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.1"}}}
]}. ]}.
{edoc_opts, [{preprocess, true}]}. {edoc_opts, [{preprocess, true}]}.