Skip to content

Commit

Permalink
Merge pull request #222 from zmstone/1202-fix-spec
Browse files Browse the repository at this point in the history
1202 fix spec
  • Loading branch information
zmstone authored Dec 6, 2023
2 parents 87b0996 + 212a1d7 commit cb28628
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 39 deletions.
25 changes: 1 addition & 24 deletions .github/workflows/run_test_case.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,8 @@ 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:
image: ghcr.io/emqx/emqx-builder/5.1-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
image: ghcr.io/emqx/emqx-builder/5.2-7:1.15.7-26.1.2-1-ubuntu22.04

steps:
- uses: actions/checkout@v2
Expand All @@ -28,18 +17,6 @@ jobs:
apt update
apt install -y cmake
- name: Get deps git refs for cache
id: deps-refs
run: |
scripts/get-dep-refs.sh
- 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: Run tests
run: |
make eunit
Expand Down
2 changes: 1 addition & 1 deletion rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{deps, [{jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}},
{eetcd, {git, "https://github.com/zhongwencool/eetcd", {tag, "v0.3.4"}}},
{snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe", {tag, "1.0.0"}}},
{mria, {git, "https://github.com/emqx/mria", {tag, "0.7.0"}}}
{mria, {git, "https://github.com/emqx/mria", {tag, "0.7.1"}}}
]}.

{erl_opts, [warn_unused_vars,
Expand Down
10 changes: 0 additions & 10 deletions scripts/get-dep-refs.sh

This file was deleted.

8 changes: 4 additions & 4 deletions src/ekka_locker.erl
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
, code_change/3
]).

-type(resource() :: term()).
-type resource() :: term().

-type(lock_type() :: local | leader | quorum | all).
-type lock_type() :: local | leader | quorum | all.

-type(lock_result() :: {boolean, [node() | {node(), any()}]}).
-type lock_result() :: {boolean(), [node() | {node(), any()}]}.

-type(piggyback() :: mfa() | undefined).
-type piggyback() :: mfa() | undefined.

-export_type([ resource/0
, lock_type/0
Expand Down

0 comments on commit cb28628

Please sign in to comment.