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:48:53 UTC

[logging-log4cxx] branch github-actions-clang updated: try to set path before running cmake

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 bad9cd2  try to set path before running cmake
bad9cd2 is described below

commit bad9cd25dcf9fcf2aed3b27c91062a7c6ff3716b
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Mon Aug 30 21:48:48 2021 -0400

    try to set path before running cmake
---
 .github/workflows/log4cxx-win.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/log4cxx-win.yml b/.github/workflows/log4cxx-win.yml
index e87b8f5..9a4fec6 100644
--- a/.github/workflows/log4cxx-win.yml
+++ b/.github/workflows/log4cxx-win.yml
@@ -68,18 +68,19 @@ jobs:
       if: matrix.name == 'windows-2019-msvc'
       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" ..
+        cmake -DLOG4CXX_TEST_PROGRAM_PATH=C:\msys64\usr\bin "-DCMAKE_TOOLCHAIN_FILE=$THISDIR/vcpkg/scripts/buildsystems/vcpkg.cmake" ..
         cmake --build .
 
+    - name: 'setup cmake - clang'
+      if: matrix.name == 'windows-2019-clang'
+      shell: pwsh
+      run: |
+        echo "C:\\msys64\\mingw64\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
     - name: 'run cmake - clang'
       if: matrix.name == 'windows-2019-clang'
       shell: pwsh
@@ -88,7 +89,6 @@ jobs:
         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