Skip to content

Commit

Permalink
Merging
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenewald committed Feb 20, 2024
2 parents ba734e6 + 6c15b28 commit 5e84f0b
Show file tree
Hide file tree
Showing 154 changed files with 4,730 additions and 6,723 deletions.
66 changes: 28 additions & 38 deletions .github/workflows/exchange-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
submodules: 'recursive'

- uses: actions/setup-python@v4
with: { python-version: "3.11" }
with: { python-version: "3.12" }

- name: Install LLVM 17
run: |
Expand Down Expand Up @@ -75,7 +75,11 @@ jobs:

- name: Install Python
uses: actions/setup-python@v4
with: { python-version: "3.11" }
with: { python-version: "3.12" }

- name: Install Python
uses: actions/setup-python@v4
with: { python-version: "3.12-dev" }

- name: Install LLVM 17
run: |
Expand All @@ -97,7 +101,7 @@ jobs:
run: cmake --preset=ci-sanitize

- name: Build
run: cmake --build build/sanitize -j 2
run: cmake --build build/sanitize -j

- name: Test
working-directory: exchange/build/sanitize
Expand Down Expand Up @@ -152,7 +156,11 @@ jobs:
- name: Install Python
uses: actions/setup-python@v4
with: { python-version: "3.11" }
with: { python-version: "3.12" }

- name: Install Python
uses: actions/setup-python@v4
with: { python-version: "3.12-dev" }

- name: Install dependencies
shell: bash
Expand All @@ -175,7 +183,7 @@ jobs:
run: cmake "--preset=ci-$("${{ matrix.os }}".split("-")[0])"

- name: Build
run: cmake --build build --config Release -j 2
run: cmake --build build --config Release -j

- name: Install
run: cmake --install build --config Release --prefix prefix
Expand All @@ -192,12 +200,16 @@ jobs:
os: [ubuntu-22.04]

runs-on: ${{ matrix.os }}
defaults:
run:
working-directory: exchange

env:
CC: clang-17
CXX: clang++-17
CLANG_DIR: '/usr/lib/llvm-17/lib/cmake/clang'
LLVM_DIR: '/usr/lib/llvm-17/lib/cmake/llvm'
NUTC_WRAPPER_BINARY_PATH: ${{ github.workspace }}/exchange/build/WRAPPER

steps:
- uses: actions/checkout@v3
Expand All @@ -222,22 +234,21 @@ jobs:
- name: Install Python
uses: actions/setup-python@v4
with: { python-version: "3.11" }
with: { python-version: "3.12" }

- name: Install Python
uses: actions/setup-python@v4
with: { python-version: "3.12-dev" }

- name: Setup conan
- name: Install dependencies
shell: bash
run: |
pip3 install conan
sudo apt install libssl-dev rabbitmq-server -y
bash < .github/scripts/conan-profile.sh
- name: Install dependencies
shell: bash
run: |
conan install exchange -s build_type=Release -b missing
conan install wrapper -s build_type=Release -b missing
bash < ../.github/scripts/conan-profile.sh
conan install . -s build_type=Release -b missing
- name: Setup MultiToolTask
if: matrix.os == 'windows-2022'
Expand All @@ -247,36 +258,15 @@ jobs:
- name: Configure exchange
shell: pwsh
working-directory: exchange
run: cmake "--preset=ci-$("${{ matrix.os }}".split("-")[0])"

- name: Build exchange
working-directory: exchange
run: cmake --build build --config Release -j 2
run: cmake --build build --config Release -j

- name: Install exchange
working-directory: exchange
run: cmake --install build --config Release --prefix prefix

- name: Install Python Developer Headers
run: sudo apt install python3.11-dev

# TODO: cache wrapper
- name: Configure wrapper
shell: pwsh
working-directory: wrapper
run: cmake "--preset=ci-$("${{ matrix.os }}".split("-")[0])"

- name: Build wrapper
working-directory: wrapper
run: cmake --build build --config Release -j 2

- name: Install wrapper
working-directory: wrapper
run: sudo cmake --install build --config Release --prefix /usr/local
run: cmake --install build --config Release --prefix .

- name: Move test algo files
working-directory: exchange
run: cp -r test/test_algos build/test/test_algos

# TODO: use secrets
Expand Down Expand Up @@ -331,7 +321,7 @@ jobs:
submodules: 'recursive'

- uses: actions/setup-python@v4
with: { python-version: "3.11" }
with: { python-version: "3.12" }

- name: Install m.css dependencies
run: pip3 install jinja2 Pygments
Expand Down
239 changes: 0 additions & 239 deletions .github/workflows/wrapper-ci.yml

This file was deleted.

4 changes: 3 additions & 1 deletion exchange/.clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ Checks: "\
-hicpp-uppercase-literal-suffix,\
-bugprone-easily-swappable-parameters,\
-cppcoreguidelines-avoid-const-or-ref-data-members,\
-cppcoreguidelines-avoid-do-while"
-cppcoreguidelines-avoid-do-while, \
-*-magic-numbers, \
-*-vararg"
WarningsAsErrors: false
AnalyzeTemporaryDtors: false
FormatStyle: file
Expand Down
Loading

0 comments on commit 5e84f0b

Please sign in to comment.