From 59ed4d7a8695897f1d5f936322bb78d5aa5cb84f Mon Sep 17 00:00:00 2001 From: Brennan Ashton Date: Fri, 30 Oct 2020 23:44:25 -0700 Subject: [PATCH] Add ALSA support in CI Signed-off-by: Brennan Ashton --- docker/linux/Dockerfile | 32 ++++++++++++++++---------------- testlist/sim.dat | 3 +++ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index 0b7142f..d0f9efe 100644 --- a/docker/linux/Dockerfile +++ b/docker/linux/Dockerfile @@ -213,30 +213,30 @@ LABEL maintainer="dev@nuttx.apache.org" RUN dpkg --add-architecture i386 # This is used for the final images so make sure to not store apt cache RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq --no-install-recommends \ - git \ + avr-libc \ build-essential \ + ccache \ + curl \ gcc \ - gcc-multilib \ gcc-avr \ - avr-libc \ - wget \ - libx11-dev \ - libxext-dev \ - u-boot-tools \ + gcc-multilib \ + gettext \ + git \ lib32z1-dev \ libc6-dev-i386 \ - libx11-dev:i386 \ - libxext-dev:i386 \ - linux-libc-dev:i386 \ - curl \ - gettext \ + libasound2-dev libasound2-dev:i386 \ libcurl4-openssl-dev \ - xxd \ - unzip \ + libpulse-dev libpulse-dev:i386 \ + libx11-dev libx11-dev:i386 \ + libxext-dev libxext-dev:i386 \ + linux-libc-dev:i386 \ python3 \ - python-is-python3 \ python3-pip \ - ccache \ + python-is-python3 \ + u-boot-tools \ + unzip \ + wget \ + xxd \ && rm -rf /var/lib/apt/lists/* diff --git a/testlist/sim.dat b/testlist/sim.dat index 7f2b6e4..f4740da 100644 --- a/testlist/sim.dat +++ b/testlist/sim.dat @@ -17,3 +17,6 @@ -Darwin,sim:nxwm -Darwin,sim:touchscreen -Darwin,sim:lvgl + +# macOS doesn't have ALSA +-Darwin,sim:alsa