+avoid some diffs +avoid ci/erlang.yaml

This commit is contained in:
dinama 2021-08-20 06:43:16 +03:00
parent df03b5c5fa
commit 6ee802adcd
No known key found for this signature in database
GPG Key ID: DC1F111BFEC80053
3 changed files with 11 additions and 48 deletions

View File

@ -1,41 +0,0 @@
name: Erlang CI
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
env:
ERLANG_VERSION: 23.2
jobs:
build:
runs-on: ubuntu-latest
container:
image: erlang:23.2
steps:
- name: Checkout
uses: actions/checkout@v1
with:
submodules: recursive
- name: Restore rebar3 chache
uses: actions/cache@v1
with:
path: ~/.cache/rebar3
key: rebar3-${{ env.ERLANG_VERSION }}
- name: Get deps
run: rebar3 get-deps
- name: Compile
run: rebar3 compile
- name: Xref
run: rebar3 xref
- name: Dialyzer
run: rebar3 dialyzer
- name: Run tests
# rebar3 doesn't set TEST_DIR env var used in tests
run: TEST_DIR=`readlink -f test` rebar3 do eunit, ct

View File

@ -203,8 +203,8 @@ check_value(Value, {?EXTENDS, Extends}, State) ->
check_extends(Value, Extends, State);
check_value(Value, {?REF, RefSchemaURI}, State) ->
validate_ref(Value, RefSchemaURI, State);
check_value(_Value, _Attr, State) ->
State.
check_value(Value, _Attr, State) ->
maybe_external_check_value(Value, State).
%%% Internal functions
%% @doc Adds Property to the current path and checks the value
@ -1031,4 +1031,11 @@ add_to_path(State, Property) ->
remove_last_from_path(State) ->
jesse_state:remove_last_from_path(State).
%% @private
maybe_external_check_value(Value, State) ->
case jesse_state:get_external_validator(State) of
undefined ->
State;
Fun ->
Fun(Value, State)
end.

View File

@ -49,12 +49,9 @@ all() ->
init_per_suite(Config) ->
{ok, _} = application:ensure_all_started(jesse),
get_tests( "standard"
get_tests( "extra"
, <<"http://json-schema.org/draft-04/schema#">>
, Config)
++ get_tests( "extra"
, <<"http://json-schema.org/draft-04/schema#">>
, Config)
++ Config.
end_per_suite(_Config) ->