diff --git a/.github/workflows/log4cxx-macos.yml b/.github/workflows/log4cxx-macos.yml index 1ab41d8ef..e418a6fc7 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 8a436b928..4d55549d6 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 -----