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/06/19 12:38:01 UTC
[logging-log4cxx] branch master updated: [CI] Include a static build in continuous integration (#113)
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/master by this push:
new 475972b8 [CI] Include a static build in continuous integration (#113)
475972b8 is described below
commit 475972b8e541e42729272231e0b289440d7dd353
Author: Stephen Webb <st...@ieee.org>
AuthorDate: Sun Jun 19 22:37:57 2022 +1000
[CI] Include a static build in continuous integration (#113)
* [CI] Include a static build in continuous integration
Co-authored-by: Stephen Webb <st...@sabreautonomous.com.au>
---
.github/workflows/log4cxx.yml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/log4cxx.yml b/.github/workflows/log4cxx.yml
index 906d346c..6ab2e262 100644
--- a/.github/workflows/log4cxx.yml
+++ b/.github/workflows/log4cxx.yml
@@ -60,7 +60,7 @@ jobs:
uses: actions/cache@v2
with:
path: vcpkg
- key: ${{ runner.os }}-${{ matrix.name }}-cache
+ key: ${{ runner.os }}-${{ matrix.name }}-cache-x64
- name: 'Checkout VCPKG - Windows'
if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016') && steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
@@ -78,6 +78,7 @@ 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 - win'
if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016')
@@ -90,6 +91,17 @@ 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'
+ if: matrix.name == 'windows-2019'
+ shell: pwsh
+ run: |
+ $THISDIR=Get-Location
+ cd main
+ mkdir build-static
+ cd build-static
+ cmake -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 cmake - *nix'
if: matrix.name != 'windows-2019'
run: |