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 2022/10/26 00:42:36 UTC
[logging-log4cxx] branch LOGCXX-562 updated: only do static on windows static builds. Rename cpp11 test
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch LOGCXX-562
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/LOGCXX-562 by this push:
new 8bc9c387 only do static on windows static builds. Rename cpp11 test
8bc9c387 is described below
commit 8bc9c38774184fca81c6f84d411d5203eab4b1d1
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Tue Oct 25 20:42:30 2022 -0400
only do static on windows static builds. Rename cpp11 test
---
.github/workflows/{logcxx-cpp11.yml => log4cxx-cpp11.yml} | 2 +-
.github/workflows/log4cxx-windows.yml | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/.github/workflows/logcxx-cpp11.yml b/.github/workflows/log4cxx-cpp11.yml
similarity index 92%
rename from .github/workflows/logcxx-cpp11.yml
rename to .github/workflows/log4cxx-cpp11.yml
index 27ae68f5..60a716f6 100644
--- a/.github/workflows/logcxx-cpp11.yml
+++ b/.github/workflows/log4cxx-cpp11.yml
@@ -37,7 +37,7 @@ jobs:
cd main
mkdir build
cd build
- cmake -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_STANDARD=11 ..
+ cmake -DCMAKE_CXX_STANDARD=11 ..
cmake --build .
- name: run unit tests
diff --git a/.github/workflows/log4cxx-windows.yml b/.github/workflows/log4cxx-windows.yml
index 0f73e9fc..e89deff2 100644
--- a/.github/workflows/log4cxx-windows.yml
+++ b/.github/workflows/log4cxx-windows.yml
@@ -59,7 +59,6 @@ jobs:
cd vcpkg
./bootstrap-vcpkg.bat
./vcpkg install apr apr-util --triplet=x64-windows
- ./vcpkg install apr apr-util --triplet=x64-windows-static
- name: 'run cmake'
shell: pwsh
@@ -71,16 +70,6 @@ jobs:
cmake -DLOG4CXX_TEST_PROGRAM_PATH=C:\msys64\usr\bin "-DCMAKE_TOOLCHAIN_FILE=$THISDIR/vcpkg/scripts/buildsystems/vcpkg.cmake" -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} ..
cmake --build .
- - name: 'run cmake - win-static'
- shell: pwsh
- run: |
- $THISDIR=Get-Location
- cd main
- mkdir build-static
- cd build-static
- 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" -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} ..
- cmake --build .
-
- name: run unit tests
shell: pwsh
run: |