Merge pull request #164 from RemedyIT/jwillemsen-patch-2

Upgrade to ACE/TAO 7.1.4
RemedyIT · Apr 10, 2024 · 963a683 · 963a683
2 parents 66cc53f + 36acffd
commit 963a683
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git 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

diff --git 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" },