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

@@ -104,9 +104,9 @@ jobs:
# Cross-compilation to RTEMS
- env: BASE=7.0 RTEMS=4.10
- env: BASE=7.0 RTEMS=4.10 APT=usrmerge
- env: BASE=7.0 RTEMS=4.9
- env: BASE=7.0 RTEMS=4.9 APT=usrmerge
# Other gcc versions (added as an extra package)