From 3fa8f118ef9d506663c0b7448c52f828e0d1d111 Mon Sep 17 00:00:00 2001 From: Steve Vinoski Date: Sat, 13 Jul 2024 15:02:59 -0400 Subject: [PATCH] Add support for Erlang/OTP 27 Add OTP 27 to the github workflow yaml file. Supporting OTP 27 means we no longer support OTP 22, so remove 22.x from the github yaml file and fix README files, documentation, configure.ac and rebar.config to require 23.0 as the minimum OTP version. --- .github/workflows/main.yml | 5 +---- README.md | 2 +- README.osx | 2 +- configure.ac | 6 +++--- doc/yaws.tex | 2 +- rebar.config | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index da877203..97b56a57 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,6 +14,7 @@ jobs: fail-fast: false matrix: otp: + - "27.0" - "26.2" - "26.1" - "26.0" @@ -29,10 +30,6 @@ jobs: - "23.2" - "23.1" - "23.0" - - "22.3" - - "22.2" - - "22.1" - - "22.0" runs-on: ubuntu-20.04 steps: - name: Checkout Repo diff --git a/README.md b/README.md index 200fe228..2900fb6e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Prepare build Get and install an Erlang system (http://www.erlang.org). -**To compile Yaws, Erlang/OTP 22.0 or higher is required.** +**To compile Yaws, Erlang/OTP 23.0 or higher is required.** If you've cloned the source from github and you want to build using autotools, note there is no ./configure script in the source, so create one: diff --git a/README.osx b/README.osx index eee5f652..1c9371fb 100644 --- a/README.osx +++ b/README.osx @@ -1,7 +1,7 @@ # Homebrew on OSX If you develop on OS X, the Yaws formula works correctly for users of -Erlang/OTP 22.0 and above. To install please run: +Erlang/OTP 23.0 and above. To install please run: brew install yaws diff --git a/configure.ac b/configure.ac index f682e6ee..ec663550 100644 --- a/configure.ac +++ b/configure.ac @@ -235,10 +235,10 @@ dnl Get ERTS version. ERLANG_CHECK_ERTS ERLANG_CHECK_RELEASE -dnl Require Erlang >=22.0 (ERTS 10.4) is required. -AX_COMPARE_VERSION([${ERLANG_ERTS_VER}], [ge], [10.4], +dnl Require Erlang >=23.0 (ERTS 11.0) is required. +AX_COMPARE_VERSION([${ERLANG_ERTS_VER}], [ge], [11.0], [], - [AC_MSG_ERROR([Erlang 22.0 or higher is required but only Erlang $ERLANG_RELEASE was found!])]) + [AC_MSG_ERROR([Erlang 23.0 or higher is required but only Erlang $ERLANG_RELEASE was found!])]) dnl Determine directories for installation. if test "x${prefix}" != "xNONE" -a "x${ERLANG_INSTALL_LIB_DIR}" = "x"; then diff --git a/doc/yaws.tex b/doc/yaws.tex index b15e127f..286cea3d 100644 --- a/doc/yaws.tex +++ b/doc/yaws.tex @@ -193,7 +193,7 @@ \subsection{Compile and Install} To compile and install a \Yaws\ release one of the prerequisites is a properly installed \Erlang\ system. \Yaws\ -runs on \Erlang\/OTP releases 22.0 and newer. Get \Erlang\ from +runs on \Erlang\/OTP releases 23.0 and newer. Get \Erlang\ from \url{http://www.erlang.org/} Compile and install is straight forward: diff --git a/rebar.config b/rebar.config index e76e9641..a4a213a2 100644 --- a/rebar.config +++ b/rebar.config @@ -1,6 +1,6 @@ %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ft=erlang ts=4 sw=4 et -{require_min_otp_vsn, "22.0"}. +{require_min_otp_vsn, "23.0"}. {sub_dirs, ["rel"]}.