From 822293de041187d7f232a1034244123b71b4e79e Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Fri, 9 Apr 2021 18:43:43 +0200
Subject: [PATCH] Add RTEMS 5 (pc686-qemu) jobs

---
 .github/workflows/build-and-test.yml            |  3 ++-
 .gitlab-ci.yml                                  | 15 +++++++++++++++
 .travis.yml                                     |  5 +++++
 .../ci-scripts-build.yml.example-full           | 17 +++++++++++++++++
 gitlab/.gitlab-ci.yml.example-full              |  9 ++++++++-
 travis/.travis.yml.example-full                 |  3 +++
 6 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 258cbe2..0a75028 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -139,6 +139,7 @@ jobs:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
       RTEMS: ${{ matrix.rtems }}
+      RTEMS_TARGET: RTEMS-pc686-qemu
       APT: re2c g++-mingw-w64-i686 g++-mingw-w64-x86-64 qemu-system-x86
     strategy:
       fail-fast: false
@@ -146,7 +147,7 @@ jobs:
         os: [ubuntu-20.04]
         cmp: [gcc]
         configuration: [default, debug]
-        rtems: ["4.9", "4.10"]
+        rtems: ["4.9", "4.10", "5"]
     steps:
     - uses: actions/checkout@v2
     - name: Prepare and compile dependencies
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3af124..92d452e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -162,3 +162,18 @@ rtems4.10_debug:
   variables:
     RTEMS: "4.10"
     BCFG: "debug"
+
+rtems5_default:
+  extends: .build
+  image: ubuntu:focal
+  variables:
+    RTEMS: "5"
+    RTEMS_TARGET: "RTEMS-pc686-qemu"
+
+rtems5_debug:
+  extends: .build
+  image: ubuntu:focal
+  variables:
+    RTEMS: "5"
+    RTEMS_TARGET: "RTEMS-pc686-qemu"
+    BCFG: "debug"
diff --git a/.travis.yml b/.travis.yml
index ee3cb48..8f6e698 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -151,6 +151,11 @@ jobs:
   - env: SET=test01 RTEMS=4.10 APT=usrmerge
   - env: SET=test01 RTEMS=4.10 BCFG=debug APT=usrmerge
 
+  - env: SET=test01 RTEMS=5 RTEMS_TARGET=RTEMS-pc686-qemu
+    dist: focal
+  - env: SET=test01 RTEMS=5 RTEMS_TARGET=RTEMS-pc686-qemu BCFG=debug
+    dist: focal
+
   - env: SET=test01
     os: windows
   - env: SET=test01 BCFG=static
diff --git a/github-actions/ci-scripts-build.yml.example-full b/github-actions/ci-scripts-build.yml.example-full
index da2eec6..f124d18 100644
--- a/github-actions/ci-scripts-build.yml.example-full
+++ b/github-actions/ci-scripts-build.yml.example-full
@@ -33,7 +33,9 @@ jobs:
       BCFG: ${{ matrix.configuration }}
       WINE: ${{ matrix.wine }}
       RTEMS: ${{ matrix.rtems }}
+      RTEMS_TARGET: ${{ matrix.rtems_target }}
       EXTRA: ${{ matrix.extra }}
+      TEST: ${{ matrix.test }}
     strategy:
       fail-fast: false
       matrix:
@@ -80,6 +82,21 @@ jobs:
             rtems: "4.9"
             name: "Ub-20 gcc-9 + RT-4.9"
 
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            rtems: "5"
+            rtems_target: RTEMS-pc686-qemu
+            name: "Ub-20 gcc-9 + RT-5.1 pc686"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            rtems: "5"
+            rtems_target: RTEMS-beatnik
+            test: NO
+            name: "Ub-20 gcc-9 + RT-5.1 beatnik"
+
           - os: ubuntu-16.04
             cmp: gcc-4.8
             utoolchain: true
diff --git a/gitlab/.gitlab-ci.yml.example-full b/gitlab/.gitlab-ci.yml.example-full
index 25c19ca..4fbd7c5 100644
--- a/gitlab/.gitlab-ci.yml.example-full
+++ b/gitlab/.gitlab-ci.yml.example-full
@@ -99,7 +99,7 @@ wine64_debug:
     BCFG: "debug"
     WINE: "64"
 
-# Cross-builds to RTEMS 4.9 and 4.10
+# Cross-builds to RTEMS 4.9, 4.10 and 5
 rtems4.9_default:
   extends: .build
   variables:
@@ -112,3 +112,10 @@ rtems4.10_debug:
     RTEMS: "4.10"
     BASE: "7.0"
     BCFG: "debug"
+
+rtems5_default:
+  extends: .build
+  image: ubuntu:focal
+  variables:
+    RTEMS: "5"
+    RTEMS_TARGET: "RTEMS-pc686-qemu"
diff --git a/travis/.travis.yml.example-full b/travis/.travis.yml.example-full
index 2ebd45d..40c895a 100644
--- a/travis/.travis.yml.example-full
+++ b/travis/.travis.yml.example-full
@@ -107,6 +107,9 @@ jobs:
 
   - env: BASE=7.0 RTEMS=4.9 APT=usrmerge
 
+  - env: BASE=7.0 RTEMS=5 RTEMS_TARGET=RTEMS-pc686-qemu
+    dist: focal
+
 # Other gcc versions (added as an extra package)
 
   - env: BASE=7.0