aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/main.yml2
-rw-r--r--docker-compose.yml2
-rw-r--r--docker/focal/test-baremetal.Dockerfile4
3 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b35fe9db4..c42f854e1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -299,6 +299,8 @@ jobs:
run: QBS_AUTOTEST_PROFILE=avr-gcc-5_4 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
- name: msp430-gcc-4_6
run: QBS_AUTOTEST_PROFILE=msp430-gcc-4_6 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
+ - name: xtensa-lx106-elf-gcc-9_2
+ run: QBS_AUTOTEST_PROFILE=xtensa-lx106-elf-gcc-9_2 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
- name: sdcc-3_8_0-mcs51
run: QBS_AUTOTEST_PROFILE=sdcc-3_8_0-mcs51 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
- name: sdcc-3_8_0-stm8
diff --git a/docker-compose.yml b/docker-compose.yml
index ef53a0fb0..e7045973b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -72,7 +72,7 @@ services:
focal-baremetal:
<< : *linux
hostname: focal-baremetal
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-baremetal-2
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-baremetal-3
build:
dockerfile: docker/focal/test-baremetal.Dockerfile
context: .
diff --git a/docker/focal/test-baremetal.Dockerfile b/docker/focal/test-baremetal.Dockerfile
index 0265ff135..bbfc4bd40 100644
--- a/docker/focal/test-baremetal.Dockerfile
+++ b/docker/focal/test-baremetal.Dockerfile
@@ -41,7 +41,9 @@ RUN apt-get update -qq && \
gcc-avr \
avr-libc \
gcc-msp430 \
- sdcc
+ sdcc \
+ binutils-xtensa-lx106 \
+ gcc-xtensa-lx106
# Work-around for QTBUG-79020.
RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh