Skip to content

Commit 29718b8

Browse files
committed
ci fixes
added missing includes asan <regex> fix
1 parent b2e2127 commit 29718b8

4 files changed

Lines changed: 16 additions & 7 deletions

File tree

.github/workflows/linux.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
sudo ln -s $(which ccache) /usr/local/bin/$CC
5555
sudo ln -s $(which ccache) /usr/local/bin/$CXX
5656
$CXX --version
57-
cmake -B build -G Ninja -DCMAKE_CXX_STANDARD=${{ matrix.cxx }} -DORYX_CRT_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release
57+
cmake -B build -G Ninja -DCMAKE_CXX_STANDARD=${{ matrix.cxx }} -DORYX_CHRON_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release
5858
cmake --build build
5959
- name: Run tests
6060
run: |
@@ -86,7 +86,7 @@ jobs:
8686
max-size: "2G"
8787
- name: Compile
8888
run: |
89-
cmake -B build -G Ninja -DORYX_CRT_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release
89+
cmake -B build -G Ninja -DORYX_CHRON_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release
9090
cmake --build build
9191
- name: Run tests
9292
run: |

.github/workflows/windows.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: windows
22

3-
on: [ push, pull_request ]
3+
on: [push, pull_request]
44

5-
env:
6-
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
5+
env:
6+
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
77

88
jobs:
99
windows-msvc:
@@ -23,8 +23,8 @@ jobs:
2323
- uses: ilammy/msvc-dev-cmd@v1
2424
- name: Compile
2525
run: |
26-
cmake -B build -DORYX_CRT_BUILD_TESTS=ON -DCMAKE_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Release
26+
cmake -B build -DORYX_CHRON_BUILD_TESTS=ON -DCMAKE_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Release
2727
cmake --build build
2828
- name: Run tests
2929
run: |
30-
.\build\Debug\chron-cpp_tests --success
30+
.\build\Debug\chron-cpp_tests --success

cmake/utils.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ function(oryx_enable_addr_sanitizer target_name)
22
if(NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
33
message(FATAL_ERROR "Sanitizer supported only for gcc/clang!")
44
endif()
5+
6+
# Fix for asan having trouble with <regex>
7+
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
8+
target_compile_options(${target_name} PRIVATE -Wno-maybe-uninitialized)
9+
endif()
10+
511
message(STATUS "Address sanitizer enabled!")
612
target_compile_options(${target_name} PRIVATE -fsanitize=address,undefined)
713
target_compile_options(${target_name} PRIVATE -fno-sanitize=signed-integer-overflow)
@@ -15,6 +21,7 @@ function(oryx_enable_thread_sanitizer target_name)
1521
if(NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
1622
message(FATAL_ERROR "Sanitizer supported only for gcc/clang!")
1723
endif()
24+
1825
message(STATUS "Thread sanitizer enabled!")
1926
target_compile_options(${target_name} PRIVATE -fsanitize=thread)
2027
target_compile_options(${target_name} PRIVATE -fno-omit-frame-pointer)

include/oryx/chron/data.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#include <string>
66
#include <vector>
77
#include <unordered_map>
8+
#include <array>
9+
#include <span>
810

911
#include "time_types.hpp"
1012

0 commit comments

Comments
 (0)