Merge branch 'master' into barrier_concurrency_fail

DOCGroup · Jan 12, 2024 · 4689fd0 · 4689fd0
2 parents 4939d6b + 7efcd5f
commit 4689fd0
Show file tree

Hide file tree

Showing 8,018 changed files with 46,073 additions and 59,305 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -0,0 +1,82 @@
+name: cmake
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 1 * * SUN'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - CC: gcc-12
+            CXX: g++-12
+            PackageDeps: g++-12
+            os: ubuntu-22.04
+          - CC: vs2019
+            CXX: vs2019
+            os: windows-2019
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os }} ${{ matrix.CXX }}
+    env:
+      ACE_ROOT: ${{ github.workspace }}/ACE
+      MPC_ROOT: ${{ github.workspace }}/MPC
+      CC: ${{ matrix.CC }}
+      CXX: ${{ matrix.CXX }}
+    steps:
+    - name: checkout ACE/TAO
+      uses: actions/checkout@v4
+    - name: checkout MPC
+      uses: actions/checkout@v4
+      with:
+        repository: DOCGroup/MPC
+        path: ${{ env.MPC_ROOT }}
+    - name: Add Repo
+      run: |
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+        sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main"
+      if: matrix.Repo != ''
+    - name: Add packages
+      run: |
+        sudo apt-get --yes update
+        sudo apt-get --yes install ${{ matrix.PackageDeps }}
+      if: matrix.PackageDeps != ''
+    - name: create $ACE_ROOT/ace/config.h
+      run: |
+        '#ifdef linux'                    > ${env:ACE_ROOT}/ace/config.h
+        '# include "ace/config-linux.h"' >> ${env:ACE_ROOT}/ace/config.h
+        '#else'                          >> ${env:ACE_ROOT}/ace/config.h
+        '# include "ace/config-win32.h"' >> ${env:ACE_ROOT}/ace/config.h
+        '#endif'                         >> ${env:ACE_ROOT}/ace/config.h
+      shell: pwsh
+    - name: Run mwc.pl on $(ACE_ROOT)/ace/ace.mwc
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type cmake ${env:ACE_ROOT}/ace/ace.mwc -workers 6
+      shell: pwsh
+    - name: Run mwc.pl on $(ACE_ROOT)/apps/gperf/src
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type cmake ${env:ACE_ROOT}/apps/gperf/src
+      shell: pwsh
+    - name: Build ace project
+      run: |
+        cd ${env:ACE_ROOT}/ace
+        cmake -S . -B build
+        cmake --build build -j6
+      shell: pwsh
+    - name: Build ACE/apps/gperf/src project
+      run: |
+        cd ${env:ACE_ROOT}/apps/gperf/src
+        cmake -S . -B build
+        cmake --build build -j6
+      shell: pwsh
diff --git a/.github/workflows/face.yml b/.github/workflows/face.yml
@@ -11,6 +11,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   build:
     strategy:
@@ -21,7 +24,7 @@ jobs:
             CXX: g++-10
             PackageDeps: g++-10
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }}
     env:
@@ -32,9 +35,9 @@ jobs:
       CXX: ${{ matrix.CXX }}
     steps:
     - name: checkout ACE/TAO
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: checkout MPC
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: DOCGroup/MPC
         path: ${{ env.MPC_ROOT }}

diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
@@ -11,6 +11,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -20,7 +23,7 @@ jobs:
 
     steps:
     - name: checkout ACE/TAO
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Run fuzz
       run: |
         perl ${env:ACE_ROOT}/bin/fuzz.pl

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -11,75 +11,79 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   build:
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/analyze to upload SARIF results
     strategy:
       fail-fast: false
       matrix:
         include:
-          - CC: gcc-4.8
-            CXX: g++-4.8
-            PackageDeps: g++-4.8
-            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-18.04
-          - CC: gcc-6
-            CXX: g++-6
-            PackageDeps: g++-6
-            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-18.04
           - CC: gcc-7
             CXX: g++-7
             PackageDeps: g++-7
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
             CheckPkgConfig: 1
           - CC: gcc-8
             CXX: g++-8
             PackageDeps: g++-8
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
           - CC: gcc-9
             CXX: g++-9
             PackageDeps: g++-9
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
           - CC: gcc-10
             CXX: g++-10
             PackageDeps: g++-10
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
           - CC: gcc-11
             CXX: g++-11
             PackageDeps: g++-11
-            optional_macros: CCFLAGS+=-std=c++20
+            optional_macros: c++std=c++20
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-20.04
-          - CC: clang-5.0
-            CXX: clang++-5.0
-            PackageDeps: clang-5.0
-            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
-            os: ubuntu-18.04
+            os: ubuntu-22.04
+          - CC: gcc-12
+            CXX: g++-12
+            PackageDeps: g++-12
+            optional_macros: c++std=c++20
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-22.04
+          - CC: gcc-13
+            CXX: g++-13
+            PackageDeps: g++-13
+            optional_macros: c++std=c++20
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+            os: ubuntu-22.04
           - CC: clang-6.0
             CXX: clang++-6.0
             PackageDeps: clang-6.0
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
           - CC: clang-7
             CXX: clang++-7
             PackageDeps: clang-7
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
           - CC: clang-8
             CXX: clang++-8
             PackageDeps: clang-8
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
           - CC: clang-9
             CXX: clang++-9
             PackageDeps: clang-9
             Repo: llvm-toolchain-$(lsb_release -cs)-9
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
           - CC: clang-10
             CXX: clang++-10
             PackageDeps: clang-10
@@ -104,20 +108,32 @@ jobs:
             Repo: llvm-toolchain-$(lsb_release -cs)-13
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
             os: ubuntu-20.04
+          - CC: clang-14
+            CXX: clang++-14
+            PackageDeps: clang-14
+            Repo: llvm-toolchain-$(lsb_release -cs)-14
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
+            os: ubuntu-22.04
+          - CC: clang-15
+            CXX: clang++-15
+            PackageDeps: clang-15
+            Repo: llvm-toolchain-$(lsb_release -cs)-15
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
+            os: ubuntu-22.04
           - feature: CORBA/e micro
             CC: gcc-10
             CXX: g++-10
             PackageDeps: g++-10
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
             optional_feature: corba_e_micro=1
             optional_macros: corba_e_micro=1
           - feature: CORBA/e compact
             CC: gcc-10
             CXX: g++-10
             PackageDeps: g++-10
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
-            os: ubuntu-18.04
+            os: ubuntu-20.04
             optional_feature: corba_e_compact=1
             optional_macros: corba_e_compact=1
           - feature: ACE for TAO
@@ -152,17 +168,21 @@ jobs:
       CXX: ${{ matrix.CXX }}
     steps:
     - name: Checkout ACE_TAO
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Checkout MPC
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: DOCGroup/MPC
         path: ${{ env.MPC_ROOT }}
-    - name: Add apt repo ${{ matrix.Repo }}
+    - name: Add LLVM apt repo ${{ matrix.Repo }}
       run: |
-        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
         sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main"
-      if: matrix.Repo != ''
+      if: startsWith (matrix.Repo, 'llvm-toolchain')
+    - name: Add PPA apt repo ${{ matrix.Repo }}
+      run: |
+        sudo apt-add-repository ${{ matrix.Repo }}
+      if: startsWith (matrix.Repo, 'ppa:')
     - name: Add apt packages ${{ matrix.PackageDeps }}
       run: |
         sudo apt-get --yes update
@@ -200,7 +220,7 @@ jobs:
       if: matrix.optional_feature != ''
       shell: pwsh
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: cpp
       if: matrix.feature == 'CodeQL'
@@ -216,6 +236,10 @@ jobs:
       run: |
         perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDL_Test -workers 4
       shell: pwsh
+    - name: Run mwc.pl on $(TAO_ROOT)/tests/IDLv4
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDLv4 -workers 4
+      shell: pwsh
     - name: Build TAO_ACE workspace
       run: |
         make -j 6 -C ${env:TAO_ROOT}
@@ -229,8 +253,12 @@ jobs:
         make -j 6 -C ${env:TAO_ROOT}/tests/IDL_Test
       shell: pwsh
       if: matrix.feature != 'CORBA/e micro'
+    - name: Build TAO/tests/IDLv4 project
+      run: |
+        make -j 6 -C ${env:TAO_ROOT}/tests/IDLv4
+      shell: pwsh
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3
       if: matrix.feature == 'CodeQL'
     - name: Install TAO_ACE workspace
       run: |

diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml
@@ -11,12 +11,15 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-10.15, macos-11.0]
+        os: [macos-11, macos-12]
         include:
           - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
     runs-on: ${{ matrix.os }}
@@ -27,9 +30,9 @@ jobs:
       MPC_ROOT: ${{ github.workspace }}/MPC
     steps:
     - name: checkout ACE/TAO
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: checkout MPC
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: DOCGroup/MPC
         path: ${{ env.MPC_ROOT }}
@@ -58,6 +61,10 @@ jobs:
       run: |
         perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDL_Test -workers 4
       shell: pwsh
+    - name: Run mwc.pl on $(TAO_ROOT)/tests/IDLv4
+      run: |
+        perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDLv4 -workers 4
+      shell: pwsh
     - name: Build TAO_ACE project
       run: |
         make -j 6 -C ${env:TAO_ROOT}
@@ -66,8 +73,12 @@ jobs:
       run: |
         make -j 6 -C ${env:ACE_ROOT}/tests
       shell: pwsh
-# Requires fixing of https://github.com/DOCGroup/ACE_TAO/issues/1525
-#    - name: Build TAO/tests/IDL_Test project
-#      run: |
-#        make -j 6 -C ${env:TAO_ROOT}/tests/IDL_Test
-#      shell: pwsh
+    - name: Build TAO/tests/IDL_Test project
+      run: |
+        make -j 6 -C ${env:TAO_ROOT}/tests/IDL_Test
+      shell: pwsh
+    - name: Build TAO/tests/IDLv4/maps project
+      run: |
+        make -j 6 -C ${env:TAO_ROOT}/tests/IDLv4
+      shell: pwsh
+