Skip to content

Commit

Permalink
Merge branch 'master' into SSL_client_unstable_connect
Browse files Browse the repository at this point in the history
  • Loading branch information
jwillemsen authored Feb 10, 2025
2 parents b7f4fba + 6dec8f2 commit 981313e
Show file tree
Hide file tree
Showing 11,744 changed files with 131,137 additions and 135,214 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
49 changes: 49 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
# This configuration requires clang-format version v12.0 or newer.
BasedOnStyle: Mozilla
#
AlignConsecutiveDeclarations: None
AlignEscapedNewlines: Left
AlignOperands: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: true
AllowShortFunctionsOnASingleLine: InlineOnly
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
# AlwaysBreakAfterDefinitionReturnType: TopLevel
# AlwaysBreakAfterReturnType: TopLevelDefinitions
BinPackArguments: false
BinPackParameters: false
# parameters will either all be on the same line or will have one line each.
BreakBeforeBraces: Custom
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: Always
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: true
AfterExternBlock: true
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: false
BeforeWhile: true
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: true
SplitEmptyNamespace: true
# based on BreakBeforeBraces: GNU
ColumnLimit: 123 # MAYBE up to 160
#
# XXX v13.0 only IndentAccessModifiers: true
#
IndentPPDirectives: AfterHash
SortUsingDeclarations: false
SpaceAfterTemplateKeyword: true
SpaceAfterLogicalNot: false
SpaceBeforeParens: Always
SpaceInEmptyBlock: false
...
13 changes: 13 additions & 0 deletions .github/issue_template.md → .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

<!---
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.
--->

### Version

The version of ACE and/or TAO you are using
Expand Down
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Set update schedule for GitHub Actions
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
82 changes: 82 additions & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
@@ -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
87 changes: 87 additions & 0 deletions .github/workflows/face.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: face

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-10
CXX: g++-10
PackageDeps: g++-10
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
os: ubuntu-20.04
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }}
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@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 }}
- name: create $ACE_ROOT/ace/config.h
run: |
'#define ACE_FACE_SAFETY_BASE' > ${env:ACE_ROOT}/ace/config.h
'#include "ace/config-linux.h"' >> ${env:ACE_ROOT}/ace/config.h
shell: pwsh
- name: add optional optional macros
run: |
'${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
shell: pwsh
if: matrix.optional_macros != ''
- name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
run: |
'${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
shell: pwsh
- name: add optional optional feature
run: |
'${{ matrix.optional_feature }}' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
if: matrix.optional_feature != ''
shell: pwsh
- name: Run mwc.pl on $(ACE_ROOT)/ace/ace.mwc
run: |
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:ACE_ROOT}/ace/ace.mwc -workers 4
shell: pwsh
- name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc
run: |
perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:ACE_ROOT}/tests/tests.mwc -workers 4
shell: pwsh
- name: Build ace project
run: |
make -j 6 -C ${env:ACE_ROOT}/ace
shell: pwsh
- name: Build ACE/tests project
run: |
make -j 6 -C ${env:ACE_ROOT}/tests
shell: pwsh
30 changes: 30 additions & 0 deletions .github/workflows/fuzz.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: fuzz

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:
runs-on: ubuntu-latest
env:
ACE_ROOT: ${{ github.workspace }}/ACE
TAO_ROOT: ${{ github.workspace }}/TAO

steps:
- name: checkout ACE/TAO
uses: actions/checkout@v4
- name: Run fuzz
run: |
perl ${env:ACE_ROOT}/bin/fuzz.pl
shell: pwsh
56 changes: 56 additions & 0 deletions .github/workflows/linux-container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: linux-container

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
runs-on: ubuntu-22.04
name: alpine-3.18
env:
ACE_ROOT: ${{ github.workspace }}/ACE
TAO_ROOT: ${{ github.workspace }}/TAO
MPC_ROOT: ${{ github.workspace }}/MPC
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: Write configuation files
run: |
echo '#include "ace/config-linux.h"' > ${{ env.ACE_ROOT }}/ace/config.h
echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > ${{ env.ACE_ROOT }}/include/makeinclude/platform_macros.GNU
- name: Build in container
uses: addnab/docker-run-action@v3
with:
image: alpine:3.18
options: -v ${{ github.workspace }}:${{ github.workspace }}
run: |
apk add --no-cache git bash make g++ perl linux-headers
export ACE_ROOT=${{ env.ACE_ROOT }}
export TAO_ROOT=${{ env.TAO_ROOT }}
export MPC_ROOT=${{ env.MPC_ROOT }}
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/TAO_ACE.mwc -workers 4
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.ACE_ROOT }}/tests/tests.mwc -workers 4
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDL_Test -workers 4
perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDLv4 -workers 4
make -j 6 -C ${{ env.TAO_ROOT }}
make -j 6 -C ${{ env.ACE_ROOT }}/tests
make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDL_Test
make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDLv4
Loading

0 comments on commit 981313e

Please sign in to comment.