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:31:06 UTC

[logging-log4cxx] branch LOGCXX-562 created (now 6637c3b0)

This is an automated email from the ASF dual-hosted git repository.

rmiddleton pushed a change to branch LOGCXX-562
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


      at 6637c3b0 Added new workflow runs and moved some others around

This branch includes the following new commits:

     new 6637c3b0 Added new workflow runs and moved some others around

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: Added new workflow runs and moved some others around

Posted by rm...@apache.org.
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

commit 6637c3b04e58c6a73e9bd1913974406657900985
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Tue Oct 25 20:30:51 2022 -0400

    Added new workflow runs and moved some others around
---
 .github/workflows/log4cxx-posix.yml                | 86 ++++++++++++++++++++++
 .../{log4cxx.yml => log4cxx-windows-static.yml}    | 65 ++++------------
 .../workflows/{log4cxx.yml => log4cxx-windows.yml} | 51 +++----------
 .github/workflows/logcxx-cpp11.yml                 | 49 ++++++++++++
 4 files changed, 159 insertions(+), 92 deletions(-)

diff --git a/.github/workflows/log4cxx-posix.yml b/.github/workflows/log4cxx-posix.yml
new file mode 100644
index 00000000..649088fd
--- /dev/null
+++ b/.github/workflows/log4cxx-posix.yml
@@ -0,0 +1,86 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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-posix
+
+on: [push, pull_request]
+
+jobs:
+  job:
+    name: ${{ matrix.os }}-${{ matrix.cxx }}-build-and-test
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 38
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [ubuntu18-gcc, ubuntu18-clang, ubuntu20-gcc, ubuntu20-clang, ubuntu22-gcc, ubuntu22-clang, osx-11, osx-12]
+        include:
+          - name: ubuntu18-gcc
+            os: ubuntu-18.04
+            cxx: g++
+            cc: gcc
+          - name: ubuntu18-clang
+            os: ubuntu-18.04
+            cxx: clang++
+            cc: clang
+          - name: ubuntu20-gcc
+            os: ubuntu-20.04
+            cxx: g++
+            cc: gcc
+          - name: ubuntu20-clang
+            os: ubuntu-20.04
+            cxx: clang++
+            cc: clang
+          - name: ubuntu22-gcc
+            os: ubuntu-22.04
+            cxx: g++
+            cc: gcc
+          - name: ubuntu22-clang
+            os: ubuntu-22.04
+            cxx: clang++
+            cc: clang
+          - name: osx-11
+            os: macos-11
+            cxx: clang++
+            cc: clang
+          - name: osx-12
+            os: macos-12
+            cxx: clang++
+            cc: clang
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        path: main
+
+    - name: 'Configure Dependencies - Ubuntu'
+      if: startsWith( matrix.name,'ubuntu' )
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libapr1-dev libaprutil1-dev libfmt-dev
+
+    - name: 'run cmake - *nix'
+      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
diff --git a/.github/workflows/log4cxx.yml b/.github/workflows/log4cxx-windows-static.yml
similarity index 50%
copy from .github/workflows/log4cxx.yml
copy to .github/workflows/log4cxx-windows-static.yml
index 469691d4..25c0e7e1 100644
--- a/.github/workflows/log4cxx.yml
+++ b/.github/workflows/log4cxx-windows-static.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-windows-static
 
 on: [push, pull_request]
 
@@ -24,91 +24,50 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [ubuntu18-gcc, ubuntu18-clang, osx, windows-2019]
+        name: [windows-2019, windows-2022]
         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-2022
+            os: windows-2022
 
     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
       with:
         path: vcpkg
         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'
+    - name: 'Checkout VCPKG'
+      if: steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
       uses: actions/checkout@v2
       with:
         repository: microsoft/vcpkg
         path: vcpkg
         ref: af2287382b1991dbdcb7e5112d236f3323b9dd7a
 
-    - name: 'Configure Dependencies - Windows'
-      if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016') && steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
+    - name: 'Configure Dependencies'
+      if: 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
         ./vcpkg install apr apr-util --triplet=x64-windows-static
 
-    - 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 - win-static'
-      if: matrix.name == 'windows-2019'
+    - name: 'run cmake - 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 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 -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" ..
         cmake --build .
 
     - name: run unit tests
@@ -117,3 +76,5 @@ jobs:
         cd main
         cd build
         ctest -C Debug --output-on-failure -V
+
+
diff --git a/.github/workflows/log4cxx.yml b/.github/workflows/log4cxx-windows.yml
similarity index 63%
rename from .github/workflows/log4cxx.yml
rename to .github/workflows/log4cxx-windows.yml
index 469691d4..0f73e9fc 100644
--- a/.github/workflows/log4cxx.yml
+++ b/.github/workflows/log4cxx-windows.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-windows
 
 on: [push, pull_request]
 
@@ -24,54 +24,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [ubuntu18-gcc, ubuntu18-clang, osx, windows-2019]
+        name: [windows-2019, windows-2022]
         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-2022
+            os: windows-2022
 
     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
       with:
         path: vcpkg
         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'
+    - name: 'Checkout VCPKG'
+      if: steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
       uses: actions/checkout@v2
       with:
         repository: microsoft/vcpkg
         path: vcpkg
         ref: af2287382b1991dbdcb7e5112d236f3323b9dd7a
 
-    - name: 'Configure Dependencies - Windows'
-      if: (matrix.name == 'windows-2019' || matrix.name == 'windows-2016') && steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
+    - name: 'Configure Dependencies'
+      if: steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
       id: runvcpkg
       shell: pwsh
       run: |
@@ -80,8 +61,7 @@ jobs:
         ./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') 
+    - name: 'run cmake'
       shell: pwsh
       run: |
         $THISDIR=Get-Location
@@ -92,7 +72,6 @@ jobs:
         cmake --build .
 
     - name: 'run cmake - win-static'
-      if: matrix.name == 'windows-2019'
       shell: pwsh
       run: |
         $THISDIR=Get-Location
@@ -102,18 +81,10 @@ jobs:
         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 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
+
diff --git a/.github/workflows/logcxx-cpp11.yml b/.github/workflows/logcxx-cpp11.yml
new file mode 100644
index 00000000..27ae68f5
--- /dev/null
+++ b/.github/workflows/logcxx-cpp11.yml
@@ -0,0 +1,49 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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-cpp11
+
+on: [push, pull_request]
+
+jobs:
+  job:
+    name: log4cxx-cpp11
+    runs-on: ubuntu-20.04
+    timeout-minutes: 38
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        path: main
+
+    - name: 'Configure Dependencies - Ubuntu'
+      if: startsWith( matrix.name,'ubuntu' )
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libapr1-dev libaprutil1-dev libboost-filesystem-dev libboost-thread-dev
+
+    - name: 'run cmake - *nix'
+      run: |
+        cd main
+        mkdir build
+        cd build
+        cmake -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_STANDARD=11 ..
+        cmake --build .
+
+    - name: run unit tests
+      shell: pwsh
+      run: |
+        cd main
+        cd build
+        ctest -C Debug --output-on-failure -V
+