Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/log4cxx-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ]
Expand Down
4 changes: 2 additions & 2 deletions admin/release-review-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----
Expand Down