diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 658fce41..d0fd91e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: name: ${{ matrix.test-type }} test on OTP ${{matrix.otp_vsn}} strategy: matrix: - otp_vsn: ['28', '27', '26'] + otp_vsn: ['29', '28', '27'] rebar_vsn: ['3.27'] test-type: ['regular', 'integration'] runs-on: 'ubuntu-24.04' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab302560..14635050 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v6 - uses: erlef/setup-beam@v1 with: - otp-version: "28" + otp-version: "29" rebar3-version: "3.27" - run: rebar3 compile - run: rebar3 hex publish -r hexpm --yes diff --git a/.github/workflows/revert-release.yml b/.github/workflows/revert-release.yml index 42f87700..165312d3 100644 --- a/.github/workflows/revert-release.yml +++ b/.github/workflows/revert-release.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v6 - uses: erlef/setup-beam@v1 with: - otp-version: "28" + otp-version: "29" rebar3-version: "3.27" - run: rebar3 hex publish --revert ${{ inputs.version }} -r hexpm --yes env: diff --git a/Dockerfile b/Dockerfile index 2d9990a2..90a272f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG otp_vsn=25.3 +ARG otp_vsn=29 FROM erlang:${otp_vsn} MAINTAINER Erlang Solutions diff --git a/elvis.config b/elvis.config deleted file mode 100644 index 3500c767..00000000 --- a/elvis.config +++ /dev/null @@ -1,22 +0,0 @@ -[{elvis, [ - {config, [ - #{ - dirs => ["src/**"], - filter => "*.erl", - ruleset => erl_files, - rules => [ - {elvis_text_style, line_length, #{skip_comments => whole_line}}, - {elvis_style, export_used_types, disable}, - {elvis_style, private_data_types, disable}, - {elvis_style, no_invalid_dynamic_calls, #{ignore => [{amoc_code_server, get_md5}]}}, - {elvis_style, no_block_expressions, #{ignore => [amoc_cluster]}}, - {elvis_style, no_throw, #{ignore => [amoc_config]}} - ] - }, - #{ - dirs => ["."], - filter => "rebar.config", - ruleset => rebar_config - } - ]} -]}]. diff --git a/integration_test/build_docker_image.sh b/integration_test/build_docker_image.sh index 5ea16c62..3792360f 100755 --- a/integration_test/build_docker_image.sh +++ b/integration_test/build_docker_image.sh @@ -4,7 +4,7 @@ source "$(dirname "$0")/helper.sh" enable_strict_mode cd "$git_root" -otp_vsn="${OTP_RELEASE:-28}" +otp_vsn="${OTP_RELEASE:-29}" echo "ERLANG/OTP '${otp_vsn}'" docker build \ diff --git a/rebar.config b/rebar.config index 230840f4..6ca7a882 100644 --- a/rebar.config +++ b/rebar.config @@ -10,7 +10,7 @@ {profiles, [ {test, [ {deps, [ - {meck, "1.0.0"}, + {meck, "1.2.0"}, {proper, "1.5.0"}, {bbmustache, "1.12.2"}, {wait_helper, "0.2.1"} @@ -43,7 +43,7 @@ {project_plugins, [ {rebar3_hex, "~> 7.0"}, {rebar3_ex_doc, "~> 0.2"}, - {rebar3_lint, "~> 4.2"}, + {rebar3_lint, "~> 5.0"}, {rebar3_codecov, "~> 0.7"} ]}. @@ -67,3 +67,25 @@ ]}. {hex, [{doc, #{provider => ex_doc}}]}. + +{elvis, [ + {config, [ + #{ + files => ["src/**/*.erl"], + ruleset => erl_files, + rules => [ + {elvis_text_style, max_line_length, #{skip_comments => whole_line}}, + {elvis_style, export_used_types, disable}, + {elvis_style, private_data_types, disable}, + {elvis_style, dont_repeat_yourself, #{ignore => [amoc_config_scenario]}}, + {elvis_style, no_invalid_dynamic_calls, #{ignore => [{amoc_code_server, get_md5}]}}, + {elvis_style, no_block_expressions, #{ignore => [amoc_cluster]}}, + {elvis_style, no_throw, #{ignore => [amoc_config]}} + ] + }, + #{ + files => ["rebar.config"], + ruleset => rebar_config + } + ]} +]}.