Skip to content

Commit

Permalink
Use g++-12 for shared atomic ptr
Browse files Browse the repository at this point in the history
  • Loading branch information
durner committed Dec 15, 2023
1 parent ab4be80 commit c629a32
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 16 deletions.
6 changes: 4 additions & 2 deletions .github/actions/do-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@ runs:
- name: Configure CMake
if: ${{ inputs.clang-toolchain == 'false' }}
run: |
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-DCMAKE_C_COMPILER=gcc-12 \
-DCMAKE_CXX_COMPILER=g++-12
shell: bash

# CMake configuration option 2 - Clang toolchain
- name: Configure CMake
if: ${{ inputs.clang-toolchain == 'true' }}
# Explicitly use clang-15. The runner comes with clang-13, 14, and 15.
# However, only clang-15 and up support `-Wno-unqualified-std-cast-call`.
run: |
run: |
sudo apt install libc++-15-dev libc++abi-15-dev
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-DCMAKE_C_COMPILER=clang-15 \
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install-deps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ runs:
steps:
# Install dependencies
- name: Install dependencies
run: sudo apt update && sudo apt install liburing-dev openssl libssl-dev libjemalloc-dev lld
run: sudo apt update && sudo apt install liburing-dev openssl libssl-dev libjemalloc-dev lld gcc-12 g++-12
shell: bash

10 changes: 5 additions & 5 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ on:

env:
BUILD_TYPE: Debug
# False ASAN positives for alloc_dealloc_mismatch when running with clang
# False ASAN positives for alloc_dealloc_mismatch when running with clang
# https://github.com/llvm/llvm-project/issues/59432
ASAN_OPTIONS: alloc_dealloc_mismatch=0
ASAN_OPTIONS: alloc_dealloc_mismatch=0

jobs:
integration-test:
Expand Down Expand Up @@ -47,11 +47,11 @@ jobs:
with:
submodules: true

# Use action to install dependencies
- name: Install Dependencies
# Use action to install dependencies
- name: Install Dependencies
uses: ./.github/actions/install-deps

# Use action to build
# Use action to build
- name: Build AnyBlob
uses: ./.github/actions/do-build
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ on:

env:
BUILD_TYPE: Debug
# False ASAN positives for alloc_dealloc_mismatch when running with clang
# False ASAN positives for alloc_dealloc_mismatch when running with clang
# https://github.com/llvm/llvm-project/issues/59432
ASAN_OPTIONS: alloc_dealloc_mismatch=0
ASAN_OPTIONS: alloc_dealloc_mismatch=0

jobs:
unit-test:
Expand All @@ -33,11 +33,11 @@ jobs:
with:
submodules: true

# Use action to install dependencies
- name: Install Dependencies
# Use action to install dependencies
- name: Install Dependencies
uses: ./.github/actions/install-deps

# Use action to build
# Use action to build
- name: Build AnyBlob
uses: ./.github/actions/do-build
with:
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ AnyBlob relies on some third-party libraries:
- openssl
- jemalloc

For Ubuntu 22.04+ the following command installs the third-party libraries:
For Ubuntu 22.04 & 22.10 the following command installs the third-party libraries:
```
sudo apt update && sudo apt install liburing-dev openssl libssl-dev libjemalloc-dev lld g++-12 cmake
```

For Ubuntu 23.04+ the following command installs the third-party libraries:
```
sudo apt update && sudo apt install liburing-dev openssl libssl-dev libjemalloc-dev lld g++ cmake
```
Expand Down
4 changes: 2 additions & 2 deletions test/unit/network/send_receiver_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ TEST_CASE("send_receiver") {
verify(group.send(msgs.back().get()));

message = make_unique<utils::DataVector<uint8_t>>(length);
str = "GET / HTTP/1.1\r\nHost: db.in.tum.de\r\nConnection: keep-alive\r\n\r\n";
str = "GET / HTTP/1.1\r\nHost: db.cs.tum.edu\r\nConnection: keep-alive\r\n\r\n";
memcpy(message->data(), str.data(), str.length());
message->resize(str.length());
msgs.emplace_back(new OriginalMessage{move(message), "db.in.tum.de", 443});
msgs.emplace_back(new OriginalMessage{move(message), "db.cs.tum.edu", 443});
verify(group.send(msgs.back().get()));
}

Expand Down

0 comments on commit c629a32

Please sign in to comment.