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 4bd90ef3 Enhance release review instructions with additional details
(#568)
4bd90ef3 is described below
commit 4bd90ef37e07e3e4fb7083656b96c135f5505c8a
Author: Stephen Webb <[email protected]>
AuthorDate: Sat Dec 13 12:35:52 2025 +1100
Enhance release review instructions with additional details (#568)
---
.github/workflows/log4cxx-macos.yml | 18 +++++++++---------
admin/release-review-instructions.md | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/log4cxx-macos.yml
b/.github/workflows/log4cxx-macos.yml
index 1ab41d8e..e418a6fc 100644
--- a/.github/workflows/log4cxx-macos.yml
+++ b/.github/workflows/log4cxx-macos.yml
@@ -24,20 +24,20 @@ jobs:
strategy:
fail-fast: false
matrix:
- name: [osx-13, osx-14]
+ name: [osx-14-clang, osx-15-clang, osx-g++]
include:
- - name: osx-13
- os: macos-13
- cxx: clang++
- odbc: OFF
- qt: ON
- multiprocess: OFF
- - name: osx-14
+ - name: osx-14-clang
os: macos-14
cxx: clang++
odbc: ON
qt: OFF
multiprocess: ON
+ - name: osx-15-clang
+ os: macos-15
+ cxx: clang++
+ odbc: ON
+ qt: ON
+ multiprocess: OFF
- name: osx-g++
os: macos-latest
cxx: g++-14
@@ -53,7 +53,7 @@ jobs:
- name: 'Configure Dependencies'
run: |
- if [ ${{ matrix.os }} != macos-13 ]; then brew install apr-util; fi
+ brew install apr-util
if [ ${{ matrix.odbc }} == ON ]; then brew install unixodbc; fi
if [ ${{ matrix.qt }} == ON ]; then brew install qt; fi
if [ ${{ matrix.cxx }} == "g++-14" -a $(cmake --version | head -1 |
awk '{split($3, a, "."); print a[1]}') -lt 4 ]
diff --git a/admin/release-review-instructions.md
b/admin/release-review-instructions.md
index 8a436b92..4d55549d 100644
--- a/admin/release-review-instructions.md
+++ b/admin/release-review-instructions.md
@@ -19,8 +19,8 @@ Additional Prerequisites (Windows only)
* The `PATH` environment variable includes directories containing `cmake.exe`
and `gpg.exe`
* One of these environment variables is set (using / directory separators):
- `CMAKE_TOOLCHAIN_FILE` - The full path to the `vcpkg.cmake` file (where
APR-Util is installed)
- - `CMAKE_INSTALL_PREFIX` - The full path to the directory where EXPAT, APR
and APR-Util libraries are installed
-* If the programs `zip.exe`, `gzip.exe` and `sed.exe` are not in
`C:/msys64/usr/bin`, the environment has a variable `LOG4CXX_TEST_PROGRAM_PATH`
set to the full path containing those programs
+ - `CMAKE_INSTALL_PREFIX` - The full path to the directory where EXPAT, APR
and APR-Util libraries are installed (they can be built using [these
instructions](https://logging.staged.apache.org/log4cxx/build-cmake.html#Windows))
+* If the programs `zip.exe`, `gzip.exe` and `sed.exe` are not in
`C:\msys64\usr\bin`, the environment has a variable `LOG4CXX_TEST_PROGRAM_PATH`
set to the full path (using / directory separators) containing those programs
Steps
-----
