Skip to content

Commit fc20a30

Browse files
jwillemsenjwillemsen
authored
Merge branch 'master' into snmp_trap_branch
2 parents 3bb273c + 6c3ca3f commit fc20a30

File tree

11,125 files changed

+111140
-126703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

11,125 files changed

+111140
-126703
lines changed

‎.clang-format

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
# This configuration requires clang-format version v12.0 or newer.
3+
BasedOnStyle: Mozilla
4+
#
5+
AlignConsecutiveDeclarations: None
6+
AlignEscapedNewlines: Left
7+
AlignOperands: false
8+
AllowAllParametersOfDeclarationOnNextLine: false
9+
AllowShortBlocksOnASingleLine: true
10+
AllowShortFunctionsOnASingleLine: InlineOnly
11+
AlwaysBreakAfterDefinitionReturnType: None
12+
AlwaysBreakAfterReturnType: None
13+
# AlwaysBreakAfterDefinitionReturnType: TopLevel
14+
# AlwaysBreakAfterReturnType: TopLevelDefinitions
15+
BinPackArguments: false
16+
BinPackParameters: false
17+
# parameters will either all be on the same line or will have one line each.
18+
BreakBeforeBraces: Custom
19+
BraceWrapping:
20+
AfterCaseLabel: true
21+
AfterClass: true
22+
AfterControlStatement: Always
23+
AfterEnum: true
24+
AfterFunction: true
25+
AfterNamespace: true
26+
AfterObjCDeclaration: true
27+
AfterStruct: true
28+
AfterUnion: true
29+
AfterExternBlock: true
30+
BeforeCatch: true
31+
BeforeElse: true
32+
BeforeLambdaBody: false
33+
BeforeWhile: true
34+
IndentBraces: false
35+
SplitEmptyFunction: false
36+
SplitEmptyRecord: true
37+
SplitEmptyNamespace: true
38+
# based on BreakBeforeBraces: GNU
39+
ColumnLimit: 123 # MAYBE up to 160
40+
#
41+
# XXX v13.0 only IndentAccessModifiers: true
42+
#
43+
IndentPPDirectives: AfterHash
44+
SortUsingDeclarations: false
45+
SpaceAfterTemplateKeyword: true
46+
SpaceAfterLogicalNot: false
47+
SpaceBeforeParens: Always
48+
SpaceInEmptyBlock: false
49+
...

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ assignees: ''
77

88
---
99

10+
All support on github is best effort only, no guarantees given. When you need guaranteed support have a look at the commercial support offerings as listed at https://github.com/DOCGroup/ACE_TAO/wiki/ACE-and-TAO-Commercial-support.
11+
1012
### Version
1113

1214
The version of ACE and/or TAO you are using

‎.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Set update schedule for GitHub Actions
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"

‎.github/workflows/cmake.yml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: cmake
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 1 * * SUN'
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
build:
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
include:
23+
- CC: gcc-12
24+
CXX: g++-12
25+
PackageDeps: g++-12
26+
os: ubuntu-22.04
27+
- CC: vs2019
28+
CXX: vs2019
29+
os: windows-2019
30+
runs-on: ${{ matrix.os }}
31+
name: ${{ matrix.os }} ${{ matrix.CXX }}
32+
env:
33+
ACE_ROOT: ${{ github.workspace }}/ACE
34+
MPC_ROOT: ${{ github.workspace }}/MPC
35+
CC: ${{ matrix.CC }}
36+
CXX: ${{ matrix.CXX }}
37+
steps:
38+
- name: checkout ACE/TAO
39+
uses: actions/checkout@v4
40+
- name: checkout MPC
41+
uses: actions/checkout@v4
42+
with:
43+
repository: DOCGroup/MPC
44+
path: ${{ env.MPC_ROOT }}
45+
- name: Add Repo
46+
run: |
47+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
48+
sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main"
49+
if: matrix.Repo != ''
50+
- name: Add packages
51+
run: |
52+
sudo apt-get --yes update
53+
sudo apt-get --yes install ${{ matrix.PackageDeps }}
54+
if: matrix.PackageDeps != ''
55+
- name: create $ACE_ROOT/ace/config.h
56+
run: |
57+
'#ifdef linux' > ${env:ACE_ROOT}/ace/config.h
58+
'# include "ace/config-linux.h"' >> ${env:ACE_ROOT}/ace/config.h
59+
'#else' >> ${env:ACE_ROOT}/ace/config.h
60+
'# include "ace/config-win32.h"' >> ${env:ACE_ROOT}/ace/config.h
61+
'#endif' >> ${env:ACE_ROOT}/ace/config.h
62+
shell: pwsh
63+
- name: Run mwc.pl on $(ACE_ROOT)/ace/ace.mwc
64+
run: |
65+
perl ${env:ACE_ROOT}/bin/mwc.pl -type cmake ${env:ACE_ROOT}/ace/ace.mwc -workers 6
66+
shell: pwsh
67+
- name: Run mwc.pl on $(ACE_ROOT)/apps/gperf/src
68+
run: |
69+
perl ${env:ACE_ROOT}/bin/mwc.pl -type cmake ${env:ACE_ROOT}/apps/gperf/src
70+
shell: pwsh
71+
- name: Build ace project
72+
run: |
73+
cd ${env:ACE_ROOT}/ace
74+
cmake -S . -B build
75+
cmake --build build -j6
76+
shell: pwsh
77+
- name: Build ACE/apps/gperf/src project
78+
run: |
79+
cd ${env:ACE_ROOT}/apps/gperf/src
80+
cmake -S . -B build
81+
cmake --build build -j6
82+
shell: pwsh

‎.github/workflows/face.yml

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
name: face
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 1 * * SUN'
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
build:
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
include:
23+
- CC: gcc-10
24+
CXX: g++-10
25+
PackageDeps: g++-10
26+
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
27+
os: ubuntu-20.04
28+
runs-on: ${{ matrix.os }}
29+
name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }}
30+
env:
31+
ACE_ROOT: ${{ github.workspace }}/ACE
32+
TAO_ROOT: ${{ github.workspace }}/TAO
33+
MPC_ROOT: ${{ github.workspace }}/MPC
34+
CC: ${{ matrix.CC }}
35+
CXX: ${{ matrix.CXX }}
36+
steps:
37+
- name: checkout ACE/TAO
38+
uses: actions/checkout@v4
39+
- name: checkout MPC
40+
uses: actions/checkout@v4
41+
with:
42+
repository: DOCGroup/MPC
43+
path: ${{ env.MPC_ROOT }}
44+
- name: Add Repo
45+
run: |
46+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
47+
sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main"
48+
if: matrix.Repo != ''
49+
- name: Add packages
50+
run: |
51+
sudo apt-get --yes update
52+
sudo apt-get --yes install ${{ matrix.PackageDeps }}
53+
- name: create $ACE_ROOT/ace/config.h
54+
run: |
55+
'#define ACE_FACE_SAFETY_BASE' > ${env:ACE_ROOT}/ace/config.h
56+
'#include "ace/config-linux.h"' >> ${env:ACE_ROOT}/ace/config.h
57+
shell: pwsh
58+
- name: add optional optional macros
59+
run: |
60+
'${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
61+
shell: pwsh
62+
if: matrix.optional_macros != ''
63+
- name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
64+
run: |
65+
'${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
66+
shell: pwsh
67+
- name: add optional optional feature
68+
run: |
69+
'${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
70+
if: matrix.optional_feature != ''
71+
shell: pwsh
72+
- name: Run mwc.pl on $(ACE_ROOT)/ace/ace.mwc
73+
run: |
74+
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:ACE_ROOT}/ace/ace.mwc -workers 4
75+
shell: pwsh
76+
- name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc
77+
run: |
78+
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:ACE_ROOT}/tests/tests.mwc -workers 4
79+
shell: pwsh
80+
- name: Build ace project
81+
run: |
82+
make -j 6 -C ${env:ACE_ROOT}/ace
83+
shell: pwsh
84+
- name: Build ACE/tests project
85+
run: |
86+
make -j 6 -C ${env:ACE_ROOT}/tests
87+
shell: pwsh

‎.github/workflows/fuzz.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ on:
44
push:
55
pull_request:
66
schedule:
7-
- cron: '0 7 * * SUN'
7+
- cron: '0 1 * * SUN'
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
permissions:
15+
contents: read
816

917
jobs:
1018
build:
@@ -15,7 +23,7 @@ jobs:
1523

1624
steps:
1725
- name: checkout ACE/TAO
18-
uses: actions/checkout@v2
26+
uses: actions/checkout@v4
1927
- name: Run fuzz
2028
run: |
2129
perl ${env:ACE_ROOT}/bin/fuzz.pl

‎.github/workflows/linux-container.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: linux-container
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 1 * * SUN'
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
build:
19+
strategy:
20+
fail-fast: false
21+
runs-on: ubuntu-22.04
22+
name: alpine-3.18
23+
env:
24+
ACE_ROOT: ${{ github.workspace }}/ACE
25+
TAO_ROOT: ${{ github.workspace }}/TAO
26+
MPC_ROOT: ${{ github.workspace }}/MPC
27+
steps:
28+
- name: Checkout ACE_TAO
29+
uses: actions/checkout@v4
30+
- name: Checkout MPC
31+
uses: actions/checkout@v4
32+
with:
33+
repository: DOCGroup/MPC
34+
path: ${{ env.MPC_ROOT }}
35+
- name: Write configuation files
36+
run: |
37+
echo '#include "ace/config-linux.h"' > ${{ env.ACE_ROOT }}/ace/config.h
38+
echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > ${{ env.ACE_ROOT }}/include/makeinclude/platform_macros.GNU
39+
- name: Build in container
40+
uses: addnab/docker-run-action@v3
41+
with:
42+
image: alpine:3.18
43+
options: -v ${{ github.workspace }}:${{ github.workspace }}
44+
run: |
45+
apk add --no-cache git bash make g++ perl linux-headers
46+
export ACE_ROOT=${{ env.ACE_ROOT }}
47+
export TAO_ROOT=${{ env.TAO_ROOT }}
48+
export MPC_ROOT=${{ env.MPC_ROOT }}
49+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/TAO_ACE.mwc -workers 4
50+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.ACE_ROOT }}/tests/tests.mwc -workers 4
51+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDL_Test -workers 4
52+
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDLv4 -workers 4
53+
make -j 6 -C ${{ env.TAO_ROOT }}
54+
make -j 6 -C ${{ env.ACE_ROOT }}/tests
55+
make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDL_Test
56+
make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDLv4

0 commit comments

Comments
 (0)