From b2350c3477bbf0cb355ff3ba44bc98eacad0292d Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Thu, 19 May 2022 00:36:25 +0000 Subject: [PATCH 1/2] Support OTP 23..25 inclusively Adds a requirement to support OTP-25, which also means deprecating explicit support for OTP-22. --- .github/workflows/main.yml | 4 ++-- .github/workflows/nightly.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/shelltests.yml | 4 ++-- README.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b139fb642..c5982edfb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,14 +15,14 @@ jobs: strategy: matrix: - otp_version: [22, 23, 24] + otp_version: [23, 24, 25] os: [ubuntu-latest] container: image: erlang:${{ matrix.otp_version }} env: - LATEST_OTP_RELEASE: 24 + LATEST_OTP_RELEASE: 25 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index cde08b80d..2ec33e781 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -15,7 +15,7 @@ jobs: - uses: erlef/setup-beam@v1 with: - otp-version: '22.3.4.9' + otp-version: '23.3.4.14' - name: Compile run: ./bootstrap - name: CT tests diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3ae1227ba..e56e4f8ca 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: - uses: erlef/setup-beam@v1 with: - otp-version: '22.3.4.9' + otp-version: '23.3.4.14' - name: Compile run: ./bootstrap - name: CT tests diff --git a/.github/workflows/shelltests.yml b/.github/workflows/shelltests.yml index c09a58bae..d98cba81a 100644 --- a/.github/workflows/shelltests.yml +++ b/.github/workflows/shelltests.yml @@ -15,8 +15,8 @@ jobs: - uses: actions/checkout@v2 - uses: erlef/setup-beam@v1 with: - otp-version: '24.0.1' - elixir-version: '1.12' + otp-version: '25.0' + elixir-version: '1.13' - name: Compile run: ./bootstrap - name: Install diff --git a/README.md b/README.md index 9b97791ae..f6c4f9203 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Rebar3 -[![Build Status](https://github.com/erlang/rebar3/workflows/Common%20Test/badge.svg)](https://github.com/erlang/rebar3/actions?query=branch%3Amaster+workflow%3A"Common+Test") [![Erlang Versions](https://img.shields.io/badge/Supported%20Erlang%2FOTP-22.0%20to%2024.0-blue)](http://www.erlang.org) +[![Build Status](https://github.com/erlang/rebar3/workflows/Common%20Test/badge.svg)](https://github.com/erlang/rebar3/actions?query=branch%3Amaster+workflow%3A"Common+Test") [![Erlang Versions](https://img.shields.io/badge/Supported%20Erlang%2FOTP-23.0%20to%2025.0-blue)](http://www.erlang.org) 1. [What is Rebar3?](#what-is-rebar3) 2. [Why Rebar3?](#why-rebar3) From edbb3cecc4e9e4b1071279f05d0db1d63235c3a7 Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Thu, 19 May 2022 01:00:27 +0000 Subject: [PATCH 2/2] please OTP-25 dialyzer, which is smarter about no_return() --- src/rebar_prv_shell.erl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rebar_prv_shell.erl b/src/rebar_prv_shell.erl index d4b1bc04b..43df8b081 100644 --- a/src/rebar_prv_shell.erl +++ b/src/rebar_prv_shell.erl @@ -98,10 +98,9 @@ init(State) -> ), {ok, State1}. --spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. +-spec do(rebar_state:t()) -> no_return(). do(Config) -> - shell(Config), - {ok, Config}. + shell(Config). -spec format_error(any()) -> iolist(). format_error({unknown_app, Unknown}) ->