diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f4b19c4..d6d2dff 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -24,30 +24,16 @@ jobs: - otp-version: '24' rebar3-version: 'nightly' os: 'ubuntu-latest' - - elixir-version: 'v1.0' - otp-version: '17' - os: 'ubuntu-16.04' - elixir-version: 'v1.0' otp-version: '17' os: 'ubuntu-18.04' - - elixir-version: 'v1.1' - otp-version: '18' - os: 'ubuntu-16.04' - elixir-version: 'v1.1' otp-version: '18' os: 'ubuntu-18.04' - - elixir-version: 'v1.2' - otp-version: '19' - rebar3-version: '3.10' - os: 'ubuntu-16.04' - elixir-version: 'v1.2' otp-version: '19' rebar3-version: '3.10' os: 'ubuntu-18.04' - - elixir-version: 'v1.4' - otp-version: '20' - rebar3-version: '3.11' - os: 'ubuntu-16.04' - elixir-version: 'v1.4' otp-version: '20' rebar3-version: '3.6.0' @@ -56,10 +42,6 @@ jobs: otp-version: '20' rebar3-version: '3.11' os: 'ubuntu-20.04' - - elixir-version: 'v1.6' - otp-version: '21' - rebar3-version: '3.12' - os: 'ubuntu-16.04' - elixir-version: 'v1.6' otp-version: '21' rebar3-version: '3.12' @@ -68,10 +50,6 @@ jobs: otp-version: '21' rebar3-version: '3.12' os: 'ubuntu-20.04' - - elixir-version: 'v1.7' - otp-version: '22' - rebar3-version: '3.13' - os: 'ubuntu-16.04' - elixir-version: 'v1.7' otp-version: '22' rebar3-version: '3.13' @@ -80,10 +58,6 @@ jobs: otp-version: '22' rebar3-version: '3.13' os: 'ubuntu-20.04' - - elixir-version: 'v1.10' - otp-version: '23' - rebar3-version: '3.14' - os: 'ubuntu-16.04' - elixir-version: 'v1.10' otp-version: '23' rebar3-version: '3.14' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4baa778..23d43e9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,24 +30,6 @@ jobs: - otp-version: '23.0' rebar3-version: '3.15' os: 'windows-2019' - - otp-version: '24.0.2' - rebar3-version: '3.16' - os: 'windows-2016' - - otp-version: '23.0' - rebar3-version: '3.15' - os: 'windows-2016' - - otp-version: '22.3' - rebar3-version: '3.15' - os: 'windows-2016' - - otp-version: '22.0' - rebar3-version: '3.15' - os: 'windows-2016' - - otp-version: '21.3' - rebar3-version: '3.15' - os: 'windows-2016' - - otp-version: '21.0' - rebar3-version: '3.15' - os: 'windows-2016' - elixir-version: 'v1.10' otp-version: '23' rebar3-version: '3.14' diff --git a/README.md b/README.md index 8682e69..e64a4dc 100644 --- a/README.md +++ b/README.md @@ -49,10 +49,8 @@ and Erlang/OTP. | Operating system | Erlang/OTP | Status |- |- |- -| ubuntu-16.04 | 17 - 24 | ✅ | ubuntu-18.04 | 17 - 24 | ✅ | ubuntu-20.04 | 20 - 24 | ✅ -| windows-2016 | 21* - 24 | ✅ | windows-2019 | 21* - 24 | ✅ **Note** *: prior to 23, Windows builds are only available for minor versions, e.g. 21.0, 21.3, 22.0, etc. @@ -64,10 +62,8 @@ uses that to download assets: | ImageOS | Operating system |- |- -| ubuntu16 | ubuntu-16.04 | ubuntu18 | ubuntu-18.04 | ubuntu20 | ubuntu-20.04 -| win16 | windows-2016 | win19 | windows-2019 as per the following example: diff --git a/src/setup-beam.js b/src/setup-beam.js index 7e2162c..851d66b 100644 --- a/src/setup-beam.js +++ b/src/setup-beam.js @@ -398,10 +398,8 @@ function sortVersions(left, right) { function getRunnerOSVersion() { const ImageOSToContainer = { - ubuntu16: 'ubuntu-16.04', ubuntu18: 'ubuntu-18.04', ubuntu20: 'ubuntu-20.04', - win16: 'windows-2016', win19: 'windows-2019', } const containerFromEnvImageOS = ImageOSToContainer[process.env.ImageOS]