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 00:46:25 UTC
[logging-log4cxx] branch github-actions-clang updated: removed
check for different windows versions
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 42e9648 removed check for different windows versions
42e9648 is described below
commit 42e964809b0417008b0c594a5867494b408e1e50
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Mon Aug 30 20:46:21 2021 -0400
removed check for different windows versions
---
.github/workflows/log4cxx-win.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/log4cxx-win.yml b/.github/workflows/log4cxx-win.yml
index d05cfdc..36ffd9c 100644
--- a/.github/workflows/log4cxx-win.yml
+++ b/.github/workflows/log4cxx-win.yml
@@ -42,14 +42,13 @@ jobs:
- name: 'Restore Prebuilt Dependencies'
id: restore-vcpkg-cache
- if: matrix.name == 'windows-2019' || matrix.name == 'windows-2016'
uses: actions/cache@v2
with:
path: vcpkg
key: ${{ runner.os }}-${{ matrix.name }}-cache
- name: 'Checkout VCPKG'
- if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016') && steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
+ if: steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
uses: actions/checkout@v2
with:
repository: microsoft/vcpkg
@@ -57,7 +56,7 @@ jobs:
ref: ec6fe06e8da05a8157dc8581fa96b36b571c1bd5
- name: 'Configure Dependencies'
- if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016') && steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
+ if: steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
id: runvcpkg
shell: pwsh
run: |
@@ -66,7 +65,6 @@ jobs:
./vcpkg install apr apr-util --triplet=x64-windows
- name: 'run cmake'
- if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016')
shell: pwsh
run: |
echo "C:\\msys64\\mingw64\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append