diff --git a/.ci/compatibility_tests/docker-compose-redis-singer-tls.yaml b/.ci/compatibility_tests/docker-compose-redis-single-tls.yaml similarity index 100% rename from .ci/compatibility_tests/docker-compose-redis-singer-tls.yaml rename to .ci/compatibility_tests/docker-compose-redis-single-tls.yaml diff --git a/.ci/compatibility_tests/docker-compose-redis-singer.yaml b/.ci/compatibility_tests/docker-compose-redis-single.yaml similarity index 100% rename from .ci/compatibility_tests/docker-compose-redis-singer.yaml rename to .ci/compatibility_tests/docker-compose-redis-single.yaml diff --git a/.github/workflows/run_cts_tests.yaml b/.github/workflows/run_cts_tests.yaml index e7849196a..17423cd12 100644 --- a/.github/workflows/run_cts_tests.yaml +++ b/.github/workflows/run_cts_tests.yaml @@ -251,7 +251,7 @@ jobs: - tls - tcp node_type: - - singer + - single - cluster steps: @@ -281,12 +281,12 @@ jobs: echo "redis_ipv4_address=$ipv4_address" >> $GITHUB_ENV echo "redis_ipv6_address=$ipv6_address" >> $GITHUB_ENV - name: setup - if: matrix.node_type == 'singer' && matrix.connect_type == 'tcp' + if: matrix.node_type == 'single' && matrix.connect_type == 'tcp' run: | 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 - 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: | 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 @@ -313,5 +313,3 @@ jobs: with: name: logs_redis${{ matrix.redis_tag }}_${{ matrix.node_type }}_${{ matrix.network_type }}_${{ matrix.connect_type }} path: _build/test/logs - - diff --git a/.tool-versions b/.tool-versions index 5e8cefb2a..6ece25a0e 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -erlang 22.3.4.13 +erlang 23.2.2 diff --git a/apps/emqx_auth_jwt/rebar.config b/apps/emqx_auth_jwt/rebar.config index 05b815239..3ec554950 100644 --- a/apps/emqx_auth_jwt/rebar.config +++ b/apps/emqx_auth_jwt/rebar.config @@ -1,6 +1,6 @@ {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}]}.