You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by sw...@apache.org on 2023/01/22 01:55:27 UTC
[logging-log4cxx] 02/02: Ensure CI catches logchar related compilation errors
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch nonchar_logchar_compilation_errors
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 638f573a9f1288a1d93593a0cf89667cce61848a
Author: Stephen Webb <st...@sabreautonomous.com.au>
AuthorDate: Sun Jan 22 12:40:01 2023 +1100
Ensure CI catches logchar related compilation errors
---
.github/workflows/log4cxx-windows-static.yml | 2 +-
.github/workflows/log4cxx-windows.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/log4cxx-windows-static.yml b/.github/workflows/log4cxx-windows-static.yml
index 5cb4de2a..b88c919b 100644
--- a/.github/workflows/log4cxx-windows-static.yml
+++ b/.github/workflows/log4cxx-windows-static.yml
@@ -74,7 +74,7 @@ jobs:
cd main
mkdir build
cd build
- cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBUILD_SHARED_LIBS=off -DLOG4CXX_TEST_PROGRAM_PATH=C:\msys64\usr\bin "-DCMAKE_TOOLCHAIN_FILE=$THISDIR/vcpkg/scripts/buildsystems/vcpkg.cmake" ..
+ cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBUILD_SHARED_LIBS=off -DLOG4CXX_TEST_PROGRAM_PATH=C:\msys64\usr\bin -DLOG4CXX_CHAR=wchar_t "-DCMAKE_TOOLCHAIN_FILE=$THISDIR/vcpkg/scripts/buildsystems/vcpkg.cmake" ..
cmake --build .
- name: run unit tests
diff --git a/.github/workflows/log4cxx-windows.yml b/.github/workflows/log4cxx-windows.yml
index 012c41c0..532ba636 100644
--- a/.github/workflows/log4cxx-windows.yml
+++ b/.github/workflows/log4cxx-windows.yml
@@ -74,7 +74,7 @@ jobs:
cd main
mkdir build
cd build
- cmake -DLOG4CXX_TEST_PROGRAM_PATH=C:\msys64\usr\bin "-DCMAKE_TOOLCHAIN_FILE=$THISDIR/vcpkg/scripts/buildsystems/vcpkg.cmake" ..
+ cmake -DLOG4CXX_TEST_PROGRAM_PATH=C:\msys64\usr\bin -DLOG4CXX_CHAR=unichar "-DCMAKE_TOOLCHAIN_FILE=$THISDIR/vcpkg/scripts/buildsystems/vcpkg.cmake" ..
cmake --build .
- name: run unit tests