From 9a6a158f23567295e8f4776b0e4bc6368f6a693a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20M=C3=BCllner?= Date: Mon, 30 Sep 2024 11:40:13 +0200 Subject: [PATCH 1/2] CI/CD: Add ubuntu-24.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We are currently using Ubuntu 20.04, Ubuntu 22.04, and Ubuntu latest as base images for our CI/CD builds. This patch add Ubuntu 24.04 and makes it the default for jobs where we only build on one OS. Signed-off-by: Christoph Müllner --- .github/workflows/build.yaml | 8 ++++---- .github/workflows/nightly-release.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2b04c058cb5..0e1e2c07aa0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04] + os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] compiler: [gcc, llvm] @@ -50,7 +50,7 @@ jobs: - name: make report if: | - matrix.os == 'ubuntu-22.04' + matrix.os == 'ubuntu-24.04' && (matrix.mode == 'linux' || matrix.mode == 'newlib') && matrix.compiler == 'gcc' run: | @@ -88,7 +88,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-24.04] mode: [newlib] target: [rv64gc-lp64d] sim: [spike] @@ -121,7 +121,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-24.04] mode: [newlib, linux] target: [rv64gc-lp64d] steps: diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index 1b4a3d4e6b1..743e09edb0a 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -48,7 +48,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04] + os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] compiler: [gcc, llvm] From b4e753428c6a8b22200bd139c0fdcb5e54d7f8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20M=C3=BCllner?= Date: Mon, 30 Sep 2024 11:42:31 +0200 Subject: [PATCH 2/2] CI/CD: Drop Ubuntu 20.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have build issues in Ubuntu 20.04 with QEMU, because of an outdated host dependency (glib2 is 2.64.6 but >= 2.66 is required). Ubuntu LTS releases have a standard support lifecycle of 5 years, so Ubuntu 20.04 support will be ending in about 6 months. Let's drop Ubuntu 20.04 support now, so we don't need a workaround for the QEMU issue. Signed-off-by: Christoph Müllner --- .github/workflows/build.yaml | 2 +- .github/workflows/nightly-release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0e1e2c07aa0..607430b9f9f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] + os: [ubuntu-22.04, ubuntu-24.04] mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] compiler: [gcc, llvm] diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index 743e09edb0a..1c483cd7e5c 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -48,7 +48,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] + os: [ubuntu-22.04, ubuntu-24.04] mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] compiler: [gcc, llvm]