summaryrefslogtreecommitdiff
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.Dockerfile3
3 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c42f854e1..2dc43be28 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -301,6 +301,8 @@ jobs:
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: riscv64-unknown-elf-gcc-9_3
+ run: QBS_AUTOTEST_PROFILE=riscv64-unknown-elf-gcc-9_3 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 e7045973b..38cf2c83e 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-3
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-baremetal-4
build:
dockerfile: docker/focal/test-baremetal.Dockerfile
context: .
diff --git a/docker/focal/test-baremetal.Dockerfile b/docker/focal/test-baremetal.Dockerfile
index bbfc4bd40..5bef208ca 100644
--- a/docker/focal/test-baremetal.Dockerfile
+++ b/docker/focal/test-baremetal.Dockerfile
@@ -43,7 +43,8 @@ RUN apt-get update -qq && \
gcc-msp430 \
sdcc \
binutils-xtensa-lx106 \
- gcc-xtensa-lx106
+ gcc-xtensa-lx106 \
+ gcc-riscv64-unknown-elf
# Work-around for QTBUG-79020.
RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh