This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a commit to branch move_from_unbuntu_20 in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit bc01bba96896e201787bd96196b32b460c948119 Author: Stephen Webb <[email protected]> AuthorDate: Sat Mar 29 15:56:52 2025 +1100 Update CI Ubuntu versions --- .github/workflows/abi-compatibility.yml | 6 +++--- .github/workflows/log4cxx-cpp11.yml | 2 +- .github/workflows/log4cxx-ubuntu.yml | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml index f675b88f..63feb879 100644 --- a/.github/workflows/abi-compatibility.yml +++ b/.github/workflows/abi-compatibility.yml @@ -26,7 +26,7 @@ on: [push, pull_request] jobs: job: name: abi-check - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest timeout-minutes: 38 strategy: fail-fast: false @@ -40,7 +40,7 @@ jobs: - name: 'Configure Dependencies - Ubuntu' run: | sudo apt-get update - sudo apt-get install -y libapr1-dev libaprutil1-dev elfutils vtable-dumper universal-ctags + sudo apt-get install -y gcc-9 libapr1-dev libaprutil1-dev elfutils vtable-dumper universal-ctags # note: sqlext.h exists on github VM, purge for now as we don't link correctly... sudo apt-get purge unixodbc-dev @@ -49,7 +49,7 @@ jobs: cd main mkdir build cd build - cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_C_COMPILER=gcc -DLOG4CXX_ABI_CHECK=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-Og" -DBUILD_TESTING=off .. + cmake -DCMAKE_CXX_COMPILER=g++-9 -DLOG4CXX_ABI_CHECK=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-g -Og -fno-eliminate-unused-debug-types" -DBUILD_TESTING=off .. cmake --build . - name: 'copy compat report' diff --git a/.github/workflows/log4cxx-cpp11.yml b/.github/workflows/log4cxx-cpp11.yml index adfc3226..02271371 100644 --- a/.github/workflows/log4cxx-cpp11.yml +++ b/.github/workflows/log4cxx-cpp11.yml @@ -19,7 +19,7 @@ on: [push, pull_request] jobs: job: name: log4cxx-cpp11 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 38 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/log4cxx-ubuntu.yml b/.github/workflows/log4cxx-ubuntu.yml index fc71a323..a07caadd 100644 --- a/.github/workflows/log4cxx-ubuntu.yml +++ b/.github/workflows/log4cxx-ubuntu.yml @@ -24,10 +24,10 @@ jobs: strategy: fail-fast: false matrix: - name: [ubuntu20-gcc, ubuntu20-clang, ubuntu22-gcc, ubuntu22-clang] + name: [ubuntu22-gcc, ubuntu22-clang, ubuntu24-gcc, ubuntu24-clang] include: - - name: ubuntu20-gcc - os: ubuntu-20.04 + - name: ubuntu22-gcc + os: ubuntu-22.04 cxx: g++ fmt: OFF qt: ON @@ -38,8 +38,8 @@ jobs: exitevents: OFF fuzzers: OFF logchar: utf-8 - - name: ubuntu20-clang - os: ubuntu-20.04 + - name: ubuntu22-clang + os: ubuntu-22.04 cxx: clang++ fmt: ON qt: OFF @@ -50,8 +50,8 @@ jobs: exitevents: OFF fuzzers: ON logchar: utf-8 - - name: ubuntu22-gcc - os: ubuntu-22.04 + - name: ubuntu24-gcc + os: ubuntu-24.04 cxx: g++ fmt: OFF qt: ON @@ -62,8 +62,8 @@ jobs: exitevents: ON fuzzers: OFF logchar: utf-8 - - name: ubuntu22-clang - os: ubuntu-22.04 + - name: ubuntu24-clang + os: ubuntu-24.04 cxx: clang++ fmt: ON qt: OFF
