Merge branch 'master' into sidequest/ignore-isolated-fish-resources

DevOpsOfChaos · web-flow · commit 0fde36564c07 · 2026-05-06T19:32:19.000+02:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -49,6 +49,7 @@ pipeline {
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '14', daysToKeepStr: '14', numToKeepStr: '180'))
         disableConcurrentBuilds()
+        disableResume()
         skipDefaultCheckout(true)
     }
 
diff --git a/external/libutil b/external/libutil
@@ -1 +1 @@
-Subproject commit e8a4c25e90713a85467d96405a264d8a2dd5b9a8
+Subproject commit 7fa45383c110b7b8cd486ceac92045e8a891b790
diff --git a/tests/mockupDrivers/CMakeLists.txt b/tests/mockupDrivers/CMakeLists.txt
@@ -11,3 +11,18 @@ add_library(audioMockup STATIC MockupAudioDriver.h MockupAudioDriver.cpp)
 target_link_libraries(audioMockup PUBLIC audiodrv turtle::turtle)
 target_include_directories(audioMockup INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/..)
 enable_warnings(audioMockup)
+
+# Turtle does not support override for mocked methods, so let's disable the warning
+include(CheckAndAddWarnings)
+
+check_warning(CXX "-Wno-suggest-override" CXX_WARNING__Wno_suggest_override_SUPPORTED)
+
+if (CXX_WARNING__Wno_suggest_override_SUPPORTED)
+	add_library(no_suggest_override INTERFACE)
+	target_compile_options(no_suggest_override INTERFACE
+		$<$<COMPILE_LANGUAGE:CXX>:-Wno-suggest-override>
+	)
+
+    target_link_libraries(videoMockup PRIVATE no_suggest_override)
+    target_link_libraries(audioMockup PRIVATE no_suggest_override)
+endif()

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ pipeline {`
`49`	`49`	`options {`
`50`	`50`	`buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '14', daysToKeepStr: '14', numToKeepStr: '180'))`
`51`	`51`	`disableConcurrentBuilds()`
	`52`	`+ disableResume()`
`52`	`53`	`skipDefaultCheckout(true)`
`53`	`54`	`}`
`54`	`55`