Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 7 additions & 50 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: awalsh128/cache-apt-pkgs-action@v1.3.0
- uses: awalsh128/cache-apt-pkgs-action@v1.4.3
with:
packages: libcurl4-openssl-dev libcrypto++-dev ninja-build

Expand All @@ -30,7 +30,7 @@ jobs:
# REQUIRED: Specify the required boost version
# A list of supported versions can be found here:
# https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
boost_version: 1.83.0
boost_version: 1.87.0
# OPTIONAL: Specify a platform version
platform_version: 22.04

Expand All @@ -52,49 +52,6 @@ jobs:
working-directory: ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}}
run: ./tests/bin/roar-tests

ubuntu20:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- uses: awalsh128/cache-apt-pkgs-action@v1.3.0
with:
packages: libcurl4-openssl-dev libcrypto++-dev ninja-build

- name: Install boost
uses: MarkusJx/install-boost@v2.4.5
id: install-boost
with:
# REQUIRED: Specify the required boost version
# A list of supported versions can be found here:
# https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
boost_version: 1.83.0
# OPTIONAL: Specify a platform version
platform_version: 20.04

- name: Setup clang
uses: egor-tensin/setup-clang@v1
with:
version: 15
platform: x64

- name: Configure CMake
run: >
cmake
-B ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}}
-G"Ninja"
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-DROAR_BUILD_TESTS=on
-DCMAKE_CXX_EXTENSIONS=on
-DCMAKE_CXX_COMPILER=c++
-DCMAKE_C_COMPILER=cc
-DCMAKE_CXX_STANDARD=20
env:
Boost_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}

- name: Build
run: cmake --build ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} --config ${{env.BUILD_TYPE}}

windows-msys2:
runs-on: windows-2022
defaults:
Expand Down Expand Up @@ -129,12 +86,12 @@ jobs:
run: cmake --build ${{env.WSPACE}}/build/clang_${{env.BUILD_TYPE}} --config ${{env.BUILD_TYPE}}

macos:
runs-on: macos-13
runs-on: macos-15

steps:
- uses: actions/checkout@v3

- run: brew install ninja boost cryptopp curl llvm@16
- run: brew install ninja boost cryptopp curl llvm@19

- name: Get Brew Prefix
run: |
Expand All @@ -148,9 +105,9 @@ jobs:
- name: Configure CMake
run: >
cmake
-DCMAKE_C_COMPILER=$BREW_PREFIX/opt/llvm@16/bin/clang
-DCMAKE_CXX_COMPILER=$BREW_PREFIX/opt/llvm@16/bin/clang++
-DCMAKE_LINKER=$BREW_PREFIX/opt/llvm@16/bin/lld
-DCMAKE_C_COMPILER=$BREW_PREFIX/opt/llvm@19/bin/clang
-DCMAKE_CXX_COMPILER=$BREW_PREFIX/opt/llvm@19/bin/clang++
-DCMAKE_LINKER=$BREW_PREFIX/opt/llvm@19/bin/lld
-DROAR_BUILD_TESTS=on
-S ${{github.workspace}}
-B ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}}
Expand Down
10 changes: 5 additions & 5 deletions include/roar/literals/memory.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ namespace Roar
{
inline namespace MemoryLiterals
{
constexpr unsigned long long operator"" _Bytes(unsigned long long n)
constexpr unsigned long long operator""_Bytes(unsigned long long n)
{
return n;
}

constexpr unsigned long long operator"" _KiB(unsigned long long n)
constexpr unsigned long long operator""_KiB(unsigned long long n)
{
return n * 1024ull;
}

constexpr unsigned long long operator"" _MiB(unsigned long long n)
constexpr unsigned long long operator""_MiB(unsigned long long n)
{
return n * 1024ull * 1024ull;
}

constexpr unsigned long long operator"" _GiB(unsigned long long n)
constexpr unsigned long long operator""_GiB(unsigned long long n)
{
return n * 1024ull * 1024ull * 1024ull;
}

constexpr unsigned long long operator"" _MemoryPage(unsigned long long n)
constexpr unsigned long long operator""_MemoryPage(unsigned long long n)
{
return n * 4_KiB;
}
Expand Down
2 changes: 1 addition & 1 deletion include/roar/literals/regex.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace Roar
{
inline namespace RegexLiterals
{
inline PseudoRegex operator"" _rgx(char const* regexString, std::size_t length)
inline PseudoRegex operator""_rgx(char const* regexString, std::size_t length)
{
return PseudoRegex{regexString, length};
}
Expand Down
2 changes: 1 addition & 1 deletion include/roar/server.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace Roar
boost::asio::any_io_executor executor;

/// Supply for SSL support.
std::optional<std::variant<SslServerContext, boost::asio::ssl::context>> sslContext;
std::optional<std::variant<SslServerContext, boost::asio::ssl::context>> sslContext = std::nullopt;

/// Called when an error occurs in an asynchronous routine.
std::function<void(Error&&)> onError = [](auto&&) {};
Expand Down
Loading