diff --git a/.github/workflows/run_test_case.yaml b/.github/workflows/run_test_case.yaml index 60921db..8b7c2ec 100644 --- a/.github/workflows/run_test_case.yaml +++ b/.github/workflows/run_test_case.yaml @@ -7,17 +7,7 @@ jobs: run_test_case: runs-on: ubuntu-latest - strategy: - matrix: - os: - - ubuntu22.04 - otp: - - 25.3.2-2 - elixir: - - 1.14.5 - arch: - - amd64 - container: ghcr.io/emqx/emqx-builder/5.1-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} + container: ghcr.io/emqx/emqx-builder/5.2-7:1.15.7-26.1.2-1-ubuntu22.04 steps: - uses: actions/checkout@v1 @@ -27,22 +17,10 @@ jobs: apt update apt install -y cmake - - name: Get deps git refs for cache - id: deps-refs - run: | - scripts/get-dep-refs.sh - - name: Configure git run: | git config --global --add safe.directory "*" - - name: load rocksdb cache - uses: actions/cache@v2 - with: - path: | - _build/default/lib/rocksdb/ - key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }} - - name: Compile run: | make diff --git a/rebar.config b/rebar.config index 10b777e..b5f3fa3 100644 --- a/rebar.config +++ b/rebar.config @@ -3,7 +3,7 @@ {deps, [{snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe", {tag, "1.0.7"}}}, - {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.2.0"}}}, + {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "3.3.0"}}}, {replayq, {git, "https://github.com/emqx/replayq", {tag, "0.3.6"}}}, {mnesia_rocksdb, {git, "https://github.com/emqx/mnesia_rocksdb", {tag, "0.1.14"}}}, {optvar, {git, "https://github.com/emqx/optvar", {tag, "1.0.5"}}} diff --git a/scripts/get-dep-refs.sh b/scripts/get-dep-refs.sh deleted file mode 100755 index a2de173..0000000 --- a/scripts/get-dep-refs.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -get_ref() { - local APP=$1 - #echo "{ok,Raw}=file:consult(\"rebar.lock\"), {_Vsn, Deps}=hd(Raw), {_, {git, _Url, {ref, Ref}},_} = lists:keyfind(<<\"${APP}\">>,1, Deps), io:format(\"~s\",[Ref]), init:stop()." - erl -noshell -eval "{ok,Raw}=file:consult(\"rebar.lock\"), {_Vsn, Deps}=hd(Raw), {_, {git, _Url, {ref, Ref}},_} = lists:keyfind(<<\"${APP}\">>,1, Deps), io:format(\"~s\",[Ref]), init:stop()." -} - -rebar3 get-deps -echo "::set-output name=DEP_ROCKSDB_REF::$(get_ref rocksdb)"