Update macOS hosted runner versions used by Github CI (#393)

apache · Jul 16, 2024 · 9b3095b · 9b3095b
1 parent 30e64ee
commit 9b3095b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/log4cxx-macos.yml b/.github/workflows/log4cxx-macos.yml
@@ -24,25 +24,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [osx-11, osx-12]
+        name: [osx-13, osx-14]
         include:
-          - name: osx-11
-            os: macos-11
+          - name: osx-13
+            os: macos-13
             cxx: clang++
-            cc: clang
             odbc: OFF
-          - name: osx-12
-            os: macos-12
+            qt: ON
+          - name: osx-14
+            os: macos-14
             cxx: clang++
-            cc: clang
             odbc: ON
+            qt: OFF
 
     steps:
     - uses: actions/checkout@v3
       with:
         persist-credentials: false # do not persist auth token in the local git config
         path: main
 
+    - name: 'Configure Dependencies'
+      run: |
+        if [ ${{ matrix.os }} != macos-13 ]; then brew install apr-util; fi
+        if [ ${{ matrix.odbc }} == ON ]; then brew install unixodbc; fi
+        if [ ${{ matrix.qt }} == ON ]; then brew install qt; fi
+
     - name: 'configure and build'
       run: |
         cd main
@@ -52,8 +58,7 @@ jobs:
         cmake --build .
 
     - name: run unit tests
-      shell: pwsh
       run: |
         cd main
         cd build
-        ctest -C Debug --output-on-failure -V
+        ctest -C Debug --output-on-failure
diff --git a/src/test/cpp/loggertestcase.cpp b/src/test/cpp/loggertestcase.cpp
@@ -73,13 +73,13 @@ class CountingListener : public HierarchyEventListener{
 
 	void addAppenderEvent(
 		const Logger* logger,
-			const Appender* appender){
+			const Appender* appender) override {
 		numAdded++;
 	}
 
 	void removeAppenderEvent(
 		const Logger* logger,
-			const Appender* appender){
+			const Appender* appender) override {
 		numRemoved++;
 	}
 };