You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2021/08/31 01:41:12 UTC
[logging-log4cxx] branch github-actions-clang updated: try to do
clang again
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch github-actions-clang
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/github-actions-clang by this push:
new 3b0965d try to do clang again
3b0965d is described below
commit 3b0965d0b85c4c967d4f1bbf6e36c1b57fc8e37e
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Mon Aug 30 21:40:48 2021 -0400
try to do clang again
---
.github/workflows/log4cxx-win.yml | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/log4cxx-win.yml b/.github/workflows/log4cxx-win.yml
index 41ec2b4..e87b8f5 100644
--- a/.github/workflows/log4cxx-win.yml
+++ b/.github/workflows/log4cxx-win.yml
@@ -64,7 +64,8 @@ jobs:
./bootstrap-vcpkg.bat
./vcpkg install apr apr-util --triplet=x64-windows
- - name: 'run cmake'
+ - name: 'run cmake - msvc'
+ if: matrix.name == 'windows-2019-msvc'
shell: pwsh
run: |
dir "C:\\msys64"
@@ -79,6 +80,22 @@ jobs:
cmake -DLOG4CXX_TEST_PROGRAM_PATH=C:\msys64\usr\bin -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} "-DCMAKE_TOOLCHAIN_FILE=$THISDIR/vcpkg/scripts/buildsystems/vcpkg.cmake" ..
cmake --build .
+ - name: 'run cmake - clang'
+ if: matrix.name == 'windows-2019-clang'
+ shell: pwsh
+ run: |
+ dir "C:\\msys64"
+ dir "C:\\msys64\\mingw64"
+ dir "C:\\msys64\\mingw64\\bin"
+ dir "C:\\msys64\\usr\\bin"
+ echo "C:\\msys64\\mingw64\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+ $THISDIR=Get-Location
+ cd main
+ mkdir build
+ cd build
+ cmake -DLOG4CXX_TEST_PROGRAM_PATH=C:\msys64\usr\bin -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} "-DCMAKE_TOOLCHAIN_FILE=$THISDIR/vcpkg/scripts/buildsystems/vcpkg.cmake" -G 'MSYS Makefiles' ..
+ cmake --build .
+
- name: run unit tests
shell: pwsh
run: |