diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e6f670f..05d5f39 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -4,20 +4,22 @@ on: push: branches: [ master ] pull_request: - branches: [ master ] + workflow_dispatch: jobs: test: - name: OTP ${{matrix.otp}} + name: OTP ${{matrix.otp_vsn}} strategy: matrix: - otp: ['24.0', '23.3', '22.3', '21.3'] - runs-on: 'ubuntu-20.04' + otp_vsn: ['27', '26', '25'] + rebar_vsn: ['3.23.0'] + runs-on: 'ubuntu-24.04' env: - OTPVER: ${{ matrix.otp }} + OTPVER: ${{ matrix.otp_vsn }} steps: - - uses: actions/checkout@v2 - - uses: ErlGang/setup-erlang@v1.0.0 + - uses: actions/checkout@v4 + - uses: erlef/setup-beam@v1 with: - otp-version: ${{ matrix.otp }} + otp-version: ${{ matrix.otp_vsn }} + rebar3-version: ${{ matrix.rebar_vsn }} - run: make test diff --git a/Makefile b/Makefile index b933ccd..b09fb29 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,5 @@ .PHONY: all test generate validate compile console dialyzer xref -REBARVER = 3.13.2 -ifeq ($(OTPVER),24.0) - REBARVER = 3.15.1 -endif - OutputDir ?= tmp define openapi-generator @@ -25,18 +20,14 @@ generate: validate: $(openapi-generator) validate -i openapi.yaml -compile: rebar3 - ./rebar3 compile - -console: rebar3 - ./rebar3 shell --apps=amoc_rest +compile: + rebar3 compile -rebar3: - wget https://github.com/erlang/rebar3/releases/download/${REBARVER}/rebar3 &&\ - chmod u+x rebar3 +console: + rebar3 shell --apps=amoc_rest -dialyzer: rebar3 - ./rebar3 dialyzer +dialyzer: + rebar3 dialyzer -xref: rebar3 - ./rebar3 xref +xref: + rebar3 xref diff --git a/rebar.config b/rebar.config index 736b0ab..4d13e08 100644 --- a/rebar.config +++ b/rebar.config @@ -1,10 +1,14 @@ {deps, [ - {cowboy, "2.9.0"}, - {rfc3339, "0.9.0"}, + {ranch, "2.1.0"}, + {cowboy, "2.12.0"}, {jsx, "3.1.0"}, - {jesse, "1.5.6"} + {jesse, "1.8.0"} ]}. +{dialyzer, [ + {warnings, [unknown]}, + {plt_extra_apps, [cowboy, cowlib, ranch]}]}. + {xref_checks, [ undefined_function_calls, undefined_functions, diff --git a/rebar.lock b/rebar.lock index 0e45609..db1efac 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,23 +1,23 @@ {"1.2.0", -[{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},0}, - {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},1}, - {<<"jesse">>,{pkg,<<"jesse">>,<<"1.5.6">>},0}, +[{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.12.0">>},0}, + {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.13.0">>},1}, + {<<"jesse">>,{pkg,<<"jesse">>,<<"1.8.0">>},0}, {<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},0}, - {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1}, - {<<"rfc3339">>,{pkg,<<"rfc3339">>,<<"0.9.0">>},0}]}. + {<<"ranch">>,{pkg,<<"ranch">>,<<"2.1.0">>},0}, + {<<"rfc3339">>,{pkg,<<"rfc3339">>,<<"0.9.0">>},1}]}. [ {pkg_hash,[ - {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>}, - {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>}, - {<<"jesse">>, <<"593B8CAD26AF3CC0E44C727BD8CBDE56E2B0DE4C8D2738B1C258B6936A40A6A3">>}, + {<<"cowboy">>, <<"F276D521A1FF88B2B9B4C54D0E753DA6C66DD7BE6C9FCA3D9418B561828A3731">>}, + {<<"cowlib">>, <<"DB8F7505D8332D98EF50A3EF34B34C1AFDDEC7506E4EE4DD4A3A266285D282CA">>}, + {<<"jesse">>, <<"CF7615C3F2BE892F77BCCF736F23B4BD54A0FC686C7040431AEBA5EF7932CC4D">>}, {<<"jsx">>, <<"D12516BAA0BB23A59BB35DCCAF02A1BD08243FCBB9EFE24F2D9D056CCFF71268">>}, - {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>}, + {<<"ranch">>, <<"2261F9ED9574DCFCC444106B9F6DA155E6E540B2F82BA3D42B339B93673B72A3">>}, {<<"rfc3339">>, <<"2075653DC9407541C84B1E15F8BDA2ABE95FB17C9694025E079583F2D19C1060">>}]}, {pkg_hash_ext,[ - {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>}, - {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>}, - {<<"jesse">>, <<"3F9475B0C5B242E09592604AABB03328501D7E3D8A528173B5A75396EEDB0060">>}, + {<<"cowboy">>, <<"8A7ABE6D183372CEB21CAA2709BEC928AB2B72E18A3911AA1771639BEF82651E">>}, + {<<"cowlib">>, <<"E1E1284DC3FC030A64B1AD0D8382AE7E99DA46C3246B815318A4B848873800A4">>}, + {<<"jesse">>, <<"860EF4621DDBFB72792668929BE127E45E8B07CF19EEA264B0A9D48D36CCA41B">>}, {<<"jsx">>, <<"0C5CC8FDC11B53CC25CF65AC6705AD39E54ECC56D1C22E4ADB8F5A53FB9427F3">>}, - {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>}, + {<<"ranch">>, <<"244EE3FA2A6175270D8E1FC59024FD9DBC76294A321057DE8F803B1479E76916">>}, {<<"rfc3339">>, <<"182314DE35C9F4180B22EB5F22916D8D7A799C1109A060C752970273A9332AD6">>}]} ].