Merge pull request #1064 from jwillemsen/jwi-ipv6

Extend CI builds with ipv6/ssl/xercesc and move several gcc builds from azure pipelines to github actions

3 files changed, 51 insertions, 31 deletions

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 96a231ff07f..6d08a1b7518 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -9,11 +9,42 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        name: [
+          GCC48,
+          GCC6,
+          GCC7,
+          GCC8,
+          GCC9
+        ]
+        include:
+          - name: GCC48
+            CC: gcc-4.8
+            CXX: g++-4.8
+            PackageDeps: g++-4.8
+          - name: GCC6
+            CC: gcc-6
+            CXX: g++-6
+            PackageDeps: g++-6
+          - name: GCC7
+            CC: gcc-7
+            CXX: g++-7
+            PackageDeps: g++-7
+          - name: GCC8
+            CC: gcc-8
+            CXX: g++-8
+            PackageDeps: g++-8
+          - name: GCC9
+            CC: gcc-9
+            CXX: g++-9
+            PackageDeps: g++-9
     env:
       ACE_ROOT: ${{ github.workspace }}/ACE
       TAO_ROOT: ${{ github.workspace }}/TAO
       MPC_ROOT: ${{ github.workspace }}/../MPC
-
+      CC: ${{ matrix.CC }}
+      CXX: ${{ matrix.CXX }}
     steps:
     - name: checkout ACE/TAO
       uses: actions/checkout@v1
@@ -23,15 +54,28 @@ jobs:
         repository: DOCGroup/MPC
         ref: master
         fetch-depth: 1
+    - name: Add packages
+      run: |
+        sudo apt-get --yes update
+        sudo apt-get --yes install libxerces-c-dev libssl-dev ${{ matrix.PackageDeps }}
     - name: create $ACE_ROOT/ace/config.h
       run: |
-        echo ${env:ACE_ROOT}
-        echo ${env:GITHUB_WORKSPACE}
         '#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h
       shell: pwsh
     - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU
       run: |
-        'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' >  ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+        'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+        'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+        'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+        'c++11=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+        'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' >>  ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
+    - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+      run: |
+        'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        'xerces3=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        'ssl=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
+        'versioned_namespace=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
       shell: pwsh
     - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc
       run: |
diff --git a/.travis.yml b/.travis.yml
index 97032d274a9..ba54aba53d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,8 +58,6 @@ before_script:
   - if [ "$CORBAECOMPACT" == "1" ]; then echo -e "corba_e_compact=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
   - if [ "$ACEFORTAO" == "1" ]; then echo -e "ace_for_tao=1" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
   - if [ "$ACEFORTAO" == "1" ]; then echo -e "ace_for_tao=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
-  - if [ "$CCMLW" == "1" ]; then echo -e "ccm_lw=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
-  - if [ "$CCMNOEVENT" == "1" ]; then echo -e "ccm_noevent=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
   - if [ "$USES_WCHAR" == "1" ]; then echo -e "uses_wchar=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
   - if [ "$VERSIONED" == "1" ]; then echo -e "versioned_namespace=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 83703451a08..ff4f858b1be 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -145,6 +145,7 @@ jobs:
       echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
       echo "openssl11=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
       echo "versioned_namespace=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
+      echo "ipv6=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
     displayName: Create default.features file
   - powershell: |
       echo $(OptionalFeatures) | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
@@ -177,31 +178,6 @@ jobs:
     vmImage: ubuntu-18.04
   strategy:
     matrix:
-      GCC48:
-        CC: gcc-4.8
-        CXX: g++-4.8
-        PackageDeps: g++-4.8
-        platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-      GCC6:
-        CC: gcc-6
-        CXX: g++-6
-        PackageDeps: g++-6
-        platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-      GCC7:
-        CC: gcc-7
-        CXX: g++-7
-        PackageDeps: g++-7
-        platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-      GCC8:
-        CC: gcc-8
-        CXX: g++-8
-        PackageDeps: g++-8
-        platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-      GCC9:
-        CC: gcc-9
-        CXX: g++-9
-        PackageDeps: g++-9
-        platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
       CLANG5:
         CC: clang-5.0
         CXX: clang++-5.0
@@ -250,12 +226,14 @@ jobs:
   - powershell: |
       'xerces3=1' > $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features
       'ssl=1' >> $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features
+      'ipv6=1' >> $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features
       'versioned_namespace=1' >> $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features
     displayName: Create default.features file
   - powershell: |
       'c++11=1' > $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
       'xerces3=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
       'ssl=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
+      'ipv6=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
       "$(platform_file)" >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
     displayName: Create platform_macros file
   - powershell: git clone --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT)