ci: upgrade clang-format check to v18 (Ubuntu 24.04) (#1723)

Author: summeroff

.github/workflows/clang-format.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   clang-format-check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -19,7 +19,8 @@ jobs:
 
       - name: Install clang format
         run: |
-          sudo apt-get install -y clang-format-13
+          sudo apt-get update
+          sudo apt-get install -y clang-format-18
 
       - name: 'Run clang-format'
         run: |

ci/check-format.sh

@@ -26,18 +26,18 @@ elif [[ ${OS} = "Darwin" ]] ; then
 fi
 
 # Discover clang-format
-if type clang-format-13 2> /dev/null ; then
-    CLANG_FORMAT=clang-format-13
-elif type clang-format 2> /dev/null ; then
+if command -v clang-format-18 > /dev/null 2>&1 ; then
+    CLANG_FORMAT=clang-format-18
+elif command -v clang-format > /dev/null 2>&1 ; then
     # Clang format found, but need to check version
     CLANG_FORMAT=clang-format
     V=$(clang-format --version)
-    if [[ $V != *"version 13.0"* ]]; then
-        echo "clang-format is not 13.0 (returned ${V})"
+    if [[ $V != *"version 18"* ]]; then
+        echo "clang-format is not 18 (returned ${V})"
         exit 1
     fi
 else
-    echo "No appropriate clang-format found (expected clang-format-13.0.0, or clang-format)"
+    echo "No appropriate clang-format found (expected clang-format-18, or clang-format)"
     exit 1
 fi
 

lib-streamlabs-ipc

@@ -257,8 +257,7 @@ std::shared_ptr<ipc::client> Controller::host(const std::string &uri)
 	const std::string version = GET_OSN_VERSION;
 
 	std::stringstream commandLine;
-	commandLine << "\"" << serverBinaryPath << "\""
-		    << " " << uri << " " << version;
+	commandLine << "\"" << serverBinaryPath << "\"" << " " << uri << " " << version;
 
 	std::string workingDirectory;
 

obs-studio-client/source/controller.cpp

@@ -28,12 +28,15 @@
 #include <thread>
 
 #ifdef __cplusplus
-#define INITIALIZER(f)                \
-	static void f(void);          \
-	struct f##_t_ {               \
-		f##_t_(void) { f(); } \
-	};                            \
-	static f##_t_ f##_;           \
+#define INITIALIZER(f)       \
+	static void f(void); \
+	struct f##_t_ {      \
+		f##_t_(void) \
+		{            \
+			f(); \
+		}            \
+	};                   \
+	static f##_t_ f##_;  \
 	static void f(void)
 #elif defined(_MSC_VER)
 #pragma section(".CRT$XCU", read)
@@ -144,11 +147,17 @@ template<typename T> inline std::string TypeOf(T v)
 	return "unknown";
 }
 
-#define AUTO_TYPEOF(x) \
-	template<> inline std::string TypeOf<x>(x v) { return dstr(x); }
+#define AUTO_TYPEOF(x)                               \
+	template<> inline std::string TypeOf<x>(x v) \
+	{                                            \
+		return dstr(x);                      \
+	}
 
-#define AUTO_TYPEOF_NAME(x, y) \
-	template<> inline std::string TypeOf<x>(x v) { return y; }
+#define AUTO_TYPEOF_NAME(x, y)                       \
+	template<> inline std::string TypeOf<x>(x v) \
+	{                                            \
+		return y;                            \
+	}
 
 AUTO_TYPEOF_NAME(bool, "boolean");
 AUTO_TYPEOF(int8_t);

obs-studio-client/source/utility.hpp

@@ -114,8 +114,7 @@ class OBS::Display::SystemWorkerThread final {
 		HWND m_windowHandle = NULL;
 	};
 
-	struct DestroyWindowMessageAnswer : MessageAnswer {
-	};
+	struct DestroyWindowMessageAnswer : MessageAnswer {};
 
 	SystemWorkerThread() : m_thread(&OBS::Display::SystemWorkerThread::Thread, this) {}
 	~SystemWorkerThread()

obs-studio-server/source/nodeobs_display.cpp

@@ -35,7 +35,7 @@
 #include <versionhelpers.h>
 #include <windows.h>
 EXTERN_C IMAGE_DOS_HEADER __ImageBase;
-#define HINST_THISCOMPONENT ((HINSTANCE)&__ImageBase)
+#define HINST_THISCOMPONENT ((HINSTANCE) & __ImageBase)
 
 #elif defined(__APPLE__)