Skip to content

Commit 4bd90ef

Browse files
authored
Enhance release review instructions with additional details (#568)
1 parent eb9d9ce commit 4bd90ef

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/log4cxx-macos.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
name: [osx-13, osx-14]
27+
name: [osx-14-clang, osx-15-clang, osx-g++]
2828
include:
29-
- name: osx-13
30-
os: macos-13
31-
cxx: clang++
32-
odbc: OFF
33-
qt: ON
34-
multiprocess: OFF
35-
- name: osx-14
29+
- name: osx-14-clang
3630
os: macos-14
3731
cxx: clang++
3832
odbc: ON
3933
qt: OFF
4034
multiprocess: ON
35+
- name: osx-15-clang
36+
os: macos-15
37+
cxx: clang++
38+
odbc: ON
39+
qt: ON
40+
multiprocess: OFF
4141
- name: osx-g++
4242
os: macos-latest
4343
cxx: g++-14
@@ -53,7 +53,7 @@ jobs:
5353

5454
- name: 'Configure Dependencies'
5555
run: |
56-
if [ ${{ matrix.os }} != macos-13 ]; then brew install apr-util; fi
56+
brew install apr-util
5757
if [ ${{ matrix.odbc }} == ON ]; then brew install unixodbc; fi
5858
if [ ${{ matrix.qt }} == ON ]; then brew install qt; fi
5959
if [ ${{ matrix.cxx }} == "g++-14" -a $(cmake --version | head -1 | awk '{split($3, a, "."); print a[1]}') -lt 4 ]

admin/release-review-instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Additional Prerequisites (Windows only)
1919
* The `PATH` environment variable includes directories containing `cmake.exe` and `gpg.exe`
2020
* One of these environment variables is set (using / directory separators):
2121
- `CMAKE_TOOLCHAIN_FILE` - The full path to the `vcpkg.cmake` file (where APR-Util is installed)
22-
- `CMAKE_INSTALL_PREFIX` - The full path to the directory where EXPAT, APR and APR-Util libraries are installed
23-
* 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
22+
- `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))
23+
* 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
2424

2525
Steps
2626
-----

0 commit comments

Comments
 (0)