This is an automated email from the ASF dual-hosted git repository.
swebb2066 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 6616e3af Update CI tools and scripts (#343)
6616e3af is described below
commit 6616e3af730f65cea19bd87719f7918617c16841
Author: Stephen Webb <[email protected]>
AuthorDate: Thu Feb 1 16:31:00 2024 +1100
Update CI tools and scripts (#343)
---
.github/workflows/log4cxx-ubuntu.yml | 6 +-----
.github/workflows/sonarcloud.yml | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/log4cxx-ubuntu.yml
b/.github/workflows/log4cxx-ubuntu.yml
index 03d61a91..be9e0225 100644
--- a/.github/workflows/log4cxx-ubuntu.yml
+++ b/.github/workflows/log4cxx-ubuntu.yml
@@ -29,7 +29,6 @@ jobs:
- name: ubuntu20-gcc
os: ubuntu-20.04
cxx: g++
- cc: gcc
fmt: OFF
qt: ON
odbc: OFF
@@ -38,7 +37,6 @@ jobs:
- name: ubuntu20-clang
os: ubuntu-20.04
cxx: clang++
- cc: clang
fmt: ON
qt: OFF
odbc: ON
@@ -47,7 +45,6 @@ jobs:
- name: ubuntu22-gcc
os: ubuntu-22.04
cxx: g++
- cc: gcc
fmt: OFF
qt: OFF
odbc: OFF
@@ -56,7 +53,6 @@ jobs:
- name: ubuntu22-clang
os: ubuntu-22.04
cxx: clang++
- cc: clang
fmt: ON
qt: OFF
odbc: OFF
@@ -90,7 +86,7 @@ jobs:
cd main
mkdir build
cd build
- cmake -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{
matrix.cc }} -DLOG4CXX_ENABLE_ODBC=${{ matrix.odbc }} -DLOG4CXX_QT_SUPPORT=${{
matrix.qt }} -DENABLE_MULTITHREAD_TEST=${{ matrix.multithread }}
-DLOG4CXX_EVENTS_AT_EXIT=${{ matrix.exitevents }} ..
+ cmake -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DLOG4CXX_ENABLE_ODBC=${{
matrix.odbc }} -DLOG4CXX_QT_SUPPORT=${{ matrix.qt }}
-DENABLE_MULTITHREAD_TEST=${{ matrix.multithread }}
-DLOG4CXX_EVENTS_AT_EXIT=${{ matrix.exitevents }} ..
cmake --build .
- name: run unit tests
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 2fe9fd90..7b9b57e0 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -37,10 +37,10 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better
relevancy of analysis
path: main
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v1
with:
- java-version: 11
+ java-version: 17
- name: Set up Python 3.8 for gcovr
uses: actions/setup-python@v2
