From ff79b2a5bd3d123b7c8d10592e8df626a07c6ecb Mon Sep 17 00:00:00 2001 From: Eric Saxby Date: Mon, 20 May 2024 13:11:56 -0700 Subject: [PATCH 1/4] Add support for Ubuntu 24 --- README.md | 1 + dist/index.js | 1 + src/setup-beam.js | 1 + test/setup-beam.test.js | 7 +++++++ 4 files changed, 10 insertions(+) diff --git a/README.md b/README.md index 74698245..b860ad96 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ uses that to download assets: | ubuntu18 | ubuntu-18.04 | ubuntu20 | ubuntu-20.04 | ubuntu22 | ubuntu-22.04 +| ubuntu24 | ubuntu-24.04 | win19 | windows-2019 | win22 | windows-2022 diff --git a/dist/index.js b/dist/index.js index b4a96048..117da2f2 100644 --- a/dist/index.js +++ b/dist/index.js @@ -10314,6 +10314,7 @@ function getRunnerOSVersion() { ubuntu18: 'ubuntu-18.04', ubuntu20: 'ubuntu-20.04', ubuntu22: 'ubuntu-22.04', + ubuntu24: 'ubuntu-24.04', win19: 'windows-2019', win22: 'windows-2022', } diff --git a/src/setup-beam.js b/src/setup-beam.js index 2c95a3f0..5412eeeb 100644 --- a/src/setup-beam.js +++ b/src/setup-beam.js @@ -483,6 +483,7 @@ function getRunnerOSVersion() { ubuntu18: 'ubuntu-18.04', ubuntu20: 'ubuntu-20.04', ubuntu22: 'ubuntu-22.04', + ubuntu24: 'ubuntu-24.04', win19: 'windows-2019', win22: 'windows-2022', } diff --git a/test/setup-beam.test.js b/test/setup-beam.test.js index ed5b11c9..b6c13f9f 100644 --- a/test/setup-beam.test.js +++ b/test/setup-beam.test.js @@ -130,6 +130,13 @@ async function testOTPVersions() { if (process.platform === 'linux') { before = simulateInput('version-type', 'strict') + spec = '26' + osVersion = 'ubuntu-24.04' + expected = 'OTP-26.0' + got = await setupBeam.getOTPVersion(spec, osVersion, hexMirrors) + assert.deepStrictEqual(got, expected) + + simulateInput('version-type', before) spec = '25.3.2.1' osVersion = 'ubuntu-20.04' expected = 'OTP-25.3.2.1' From 8357c8c064b28fe8f4c4776fffa73149c36673d0 Mon Sep 17 00:00:00 2001 From: Eric Saxby Date: Mon, 20 May 2024 14:12:49 -0700 Subject: [PATCH 2/4] Add ubuntu-24.04 to CI matrix --- .github/workflows/ubuntu.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 256e1c5d..131968d1 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -39,6 +39,14 @@ jobs: elixir-version: '1.14.3' os: 'ubuntu-latest' version-type: 'strict' + - otp-version: '27.0' + os: 'ubuntu-24.04' + version-type: 'strict' + - otp-version: '26.0' + os: 'ubuntu-24.04' + version-type: 'strict' + - otp-version: '25.0' + os: 'ubuntu-24.04' - otp-version: '25' elixir-version: '1' rebar3-version: '3' From 67ccfe64704a0ebb5ce30278c39b2dd612d5a3a5 Mon Sep 17 00:00:00 2001 From: Eric Saxby Date: Mon, 20 May 2024 14:49:34 -0700 Subject: [PATCH 3/4] Fix tests for checking OTP versions on ubuntu-24.04 --- test/setup-beam.test.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/setup-beam.test.js b/test/setup-beam.test.js index b6c13f9f..131042fb 100644 --- a/test/setup-beam.test.js +++ b/test/setup-beam.test.js @@ -132,7 +132,14 @@ async function testOTPVersions() { before = simulateInput('version-type', 'strict') spec = '26' osVersion = 'ubuntu-24.04' - expected = 'OTP-26.0' + expected = 'maint-26' + got = await setupBeam.getOTPVersion(spec, osVersion, hexMirrors) + assert.deepStrictEqual(got, expected) + + simulateInput('version-type', before) + spec = '27.0' + osVersion = 'ubuntu-24.04' + expected = 'OTP-27.0' got = await setupBeam.getOTPVersion(spec, osVersion, hexMirrors) assert.deepStrictEqual(got, expected) From d2ad6440a8f7071bde167f803e52e9a9a9df10e8 Mon Sep 17 00:00:00 2001 From: Eric Saxby Date: Tue, 21 May 2024 10:54:03 -0700 Subject: [PATCH 4/4] Test latest versions of OTP on ubuntu-24.04 --- .github/workflows/ubuntu.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 131968d1..81008a15 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -39,13 +39,13 @@ jobs: elixir-version: '1.14.3' os: 'ubuntu-latest' version-type: 'strict' - - otp-version: '27.0' + - otp-version: '27' os: 'ubuntu-24.04' version-type: 'strict' - - otp-version: '26.0' + - otp-version: '26' os: 'ubuntu-24.04' version-type: 'strict' - - otp-version: '25.0' + - otp-version: '25' os: 'ubuntu-24.04' - otp-version: '25' elixir-version: '1'