From 621e6a5aaf63127c49ba8b735add90241404b8c7 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 10 Apr 2024 09:56:50 +0200
Subject: [PATCH 1/2] Upgrade to ACE/TAO 7.1.4

---
 etc/brix11rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/brix11rc b/etc/brix11rc
index c4b3c58..46275b8 100644
--- a/etc/brix11rc
+++ b/etc/brix11rc
@@ -1,7 +1,7 @@
 {
   "bootstrap": [
-    { "id": "ACE", "collections": ["TAOX11", "AXCIOMA"], "dir": "ACE", "repo": "https://github.com/DOCGroup/ACE_TAO.git", "tag": "ACE+TAO-7_1_3" },
-    { "id": "MPC", "collections": ["TAOX11", "AXCIOMA"], "dir": "ACE/MPC", "repo": "https://github.com/DOCGroup/MPC.git", "tag": "ACE+TAO-7_1_3" },
+    { "id": "ACE", "collections": ["TAOX11", "AXCIOMA"], "dir": "ACE", "repo": "https://github.com/DOCGroup/ACE_TAO.git", "tag": "ACE+TAO-7_1_4" },
+    { "id": "MPC", "collections": ["TAOX11", "AXCIOMA"], "dir": "ACE/MPC", "repo": "https://github.com/DOCGroup/MPC.git", "tag": "ACE+TAO-7_1_4" },
     { "id": "ridl", "collections": ["TAOX11", "AXCIOMA"], "dir": "ridl", "repo": "https://github.com/RemedyIT/ridl.git", "tag": "master" },
     { "id": "taox11", "collections": ["TAOX11", "AXCIOMA"], "dir": "taox11", "repo": "https://github.com/RemedyIT/taox11.git", "tag": "master" },
     { "id": "ciaox11", "collections": ["AXCIOMA"], "dir": "ciaox11", "repo": "https://github.com/RemedyIT/ciaox11.git", "tag": "master" },

From ab737a130abf6dfae5b8f1afb868df0340c1be8e Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 10 Apr 2024 10:51:19 +0200
Subject: [PATCH 2/2] Remove gcc7, to old

---
 .github/workflows/linux.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index c1f467d..d5255ec 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -43,25 +43,20 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
-            CC: gcc-7
-            CXX: g++-7
-            ruby: '2.6'
-            PackageDeps: g++-7
           - os: ubuntu-20.04
             CC: gcc-8
             CXX: g++-8
-            ruby: '2.7'
+            ruby: '2.5'
             PackageDeps: g++-8
           - os: ubuntu-20.04
             CC: gcc-9
             CXX: g++-9
-            ruby: '2.7'
+            ruby: '2.6'
             PackageDeps: g++-9
           - os: ubuntu-22.04
             CC: gcc-10
             CXX: g++-10
-            ruby: '3.0'
+            ruby: '2.7'
             PackageDeps: g++-10
           - os: ubuntu-22.04
             CC: gcc-11