From 16a1e1a27342343c38fb39895bed071f3d6ea3d9 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 16 Apr 2025 15:11:48 -0400 Subject: [PATCH] ci: use ubuntu 24.04 Signed-off-by: Anas Nashif --- .github/workflows/ci.yml | 4 ++-- meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.1.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad09ad1b..1be30edf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,7 @@ jobs: # Setup setup: name: Setup - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 outputs: hosts: ${{ steps.generate-matrix.outputs.hosts }} targets: ${{ steps.generate-matrix.outputs.targets }} @@ -1679,7 +1679,7 @@ jobs: test-result: name: Test Result needs: [ test-dist-bundle ] - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 # NOTE: The 'test-result' job depends on the 'test-dist-bundle' job and # therefore only runs when all distribution bundle tests pass. diff --git a/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.1.bb b/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.1.bb index 41d84d13..a737ff6e 100644 --- a/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.1.bb +++ b/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.1.bb @@ -10,7 +10,7 @@ a variety of guest operating systems" HOMEPAGE = "http://qemu.org" LICENSE = "GPL-2.0-only & LGPL-2.1-only" -DEPENDS += "bison-native meson-native ninja-native" +DEPENDS += "bison-native meson-native ninja-native libslirp" DEPENDS += "glib-2.0 zlib pixman"