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:30:05 UTC
[logging-log4cxx] branch github-actions-clang created (now e8b6d28)
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a change to branch github-actions-clang
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git.
at e8b6d28 broke up the action into two. try to get clang working on windows
This branch includes the following new commits:
new e8b6d28 broke up the action into two. try to get clang working on windows
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[logging-log4cxx] 01/01: broke up the action into two. try to get
clang working on windows
Posted by rm...@apache.org.
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
commit e8b6d280f90585d2ce41079afd7d7cdf8430b282
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Mon Aug 30 20:29:45 2021 -0400
broke up the action into two. try to get clang working on windows
---
.../workflows/{log4cxx.yml => log4cxx-posix.yml} | 47 ++--------------------
.github/workflows/{log4cxx.yml => log4cxx-win.yml} | 45 ++++++---------------
2 files changed, 15 insertions(+), 77 deletions(-)
diff --git a/.github/workflows/log4cxx.yml b/.github/workflows/log4cxx-posix.yml
similarity index 53%
copy from .github/workflows/log4cxx.yml
copy to .github/workflows/log4cxx-posix.yml
index 1233d19..3b10f02 100644
--- a/.github/workflows/log4cxx.yml
+++ b/.github/workflows/log4cxx-posix.yml
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-name: log4cxx
+name: log4cxx-posix
on: [push, pull_request]
@@ -24,12 +24,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- name: [ubuntu18-gcc, ubuntu18-clang, osx, windows-2019]
+ name: [ubuntu18-gcc, ubuntu18-clang, osx]
include:
- - name: windows-2019
- os: windows-2019
- cxx: cl.exe
- cc: cl.exe
- name: ubuntu18-gcc
os: ubuntu-18.04
cxx: g++
@@ -54,44 +50,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y libapr1-dev libaprutil1-dev
- - name: 'Restore Prebuilt Dependencies - Windows'
- 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 - Windows'
- if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016') && steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
- uses: actions/checkout@v2
- with:
- repository: microsoft/vcpkg
- path: vcpkg
- ref: ec6fe06e8da05a8157dc8581fa96b36b571c1bd5
-
- - name: 'Configure Dependencies - Windows'
- if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016') && steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
- id: runvcpkg
- shell: pwsh
- run: |
- cd vcpkg
- ./bootstrap-vcpkg.bat
- ./vcpkg install apr apr-util --triplet=x64-windows
-
- - name: 'run cmake - win'
- if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016')
- shell: pwsh
- run: |
- $THISDIR=Get-Location
- cd main
- mkdir build
- cd build
- 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 - *nix'
- if: matrix.name != 'windows-2019'
+ - name: 'run cmake - POSIX'
run: |
cd main
mkdir build
diff --git a/.github/workflows/log4cxx.yml b/.github/workflows/log4cxx-win.yml
similarity index 71%
rename from .github/workflows/log4cxx.yml
rename to .github/workflows/log4cxx-win.yml
index 1233d19..7733dfb 100644
--- a/.github/workflows/log4cxx.yml
+++ b/.github/workflows/log4cxx-win.yml
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-name: log4cxx
+name: log4cxx-win
on: [push, pull_request]
@@ -24,37 +24,23 @@ jobs:
strategy:
fail-fast: false
matrix:
- name: [ubuntu18-gcc, ubuntu18-clang, osx, windows-2019]
+ name: [windows-2019]
include:
- name: windows-2019
os: windows-2019
cxx: cl.exe
cc: cl.exe
- - name: ubuntu18-gcc
- os: ubuntu-18.04
- cxx: g++
- cc: gcc
- - name: ubuntu18-clang
- os: ubuntu-18.04
- cxx: clang++
- cc: clang
- - name: osx
- os: macos-latest
- cxx: clang++
- cc: clang
+ - name: windows-2019
+ os: windows-2019
+ cxx: clang++.exe
+ cc: clang.exe
steps:
- uses: actions/checkout@v2
with:
path: main
- - name: 'Configure Dependencies - Ubuntu'
- if: matrix.name == 'ubuntu18-gcc' || matrix.name == 'ubuntu18-clang'
- run: |
- sudo apt-get update
- sudo apt-get install -y libapr1-dev libaprutil1-dev
-
- - name: 'Restore Prebuilt Dependencies - Windows'
+ - name: 'Restore Prebuilt Dependencies'
id: restore-vcpkg-cache
if: matrix.name == 'windows-2019' || matrix.name == 'windows-2016'
uses: actions/cache@v2
@@ -62,7 +48,7 @@ jobs:
path: vcpkg
key: ${{ runner.os }}-${{ matrix.name }}-cache
- - name: 'Checkout VCPKG - Windows'
+ - name: 'Checkout VCPKG'
if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016') && steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
uses: actions/checkout@v2
with:
@@ -70,7 +56,7 @@ jobs:
path: vcpkg
ref: ec6fe06e8da05a8157dc8581fa96b36b571c1bd5
- - name: 'Configure Dependencies - Windows'
+ - name: 'Configure Dependencies'
if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016') && steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
id: runvcpkg
shell: pwsh
@@ -79,10 +65,11 @@ jobs:
./bootstrap-vcpkg.bat
./vcpkg install apr apr-util --triplet=x64-windows
- - name: 'run cmake - win'
+ - name: 'run cmake'
if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016')
shell: pwsh
run: |
+ echo "::add-path::C:\\msys64\\mingw64\\bin"
$THISDIR=Get-Location
cd main
mkdir build
@@ -90,18 +77,10 @@ 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 - *nix'
- if: matrix.name != 'windows-2019'
- run: |
- cd main
- mkdir build
- cd build
- cmake -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} ..
- cmake --build .
-
- name: run unit tests
shell: pwsh
run: |
cd main
cd build
ctest -C Debug --output-on-failure -V
+