Install usrmerge on ubuntu (needed for RTEMS builds)

- travis: only do that for RTEMS
  (as precise & trusty don't have usrmerge)
- gitlab: use focal instead
  (apt install usrmerge doesn't work in Docker)
This commit is contained in:
Ralph Lange
2021-04-09 15:49:11 +02:00
parent 8bf77eba0c
commit c6df7df2bd
3 changed files with 10 additions and 6 deletions

View File

@@ -137,12 +137,14 @@ wine64_static_debug:
# Cross-builds to RTEMS 4.9 and 4.10
rtems4.9_default:
extends: .build
image: ubuntu:focal
variables:
RTEMS: "4.9"
BASE: "3.15"
rtems4.9_debug:
extends: .build
image: ubuntu:focal
variables:
RTEMS: "4.9"
BASE: "3.15"
@@ -150,11 +152,13 @@ rtems4.9_debug:
rtems4.10_default:
extends: .build
image: ubuntu:focal
variables:
RTEMS: "4.10"
rtems4.10_debug:
extends: .build
image: ubuntu:focal
variables:
RTEMS: "4.10"
BCFG: "debug"