CI MacOS

Author: MorganCaron

.github/workflows/ci-cpp-linux.yml

@@ -49,10 +49,16 @@ jobs:
       if: ${{ matrix.compiler.name == 'Latest Clang' }}
       uses: MorganCaron/latest-clang-action@master
 
-    - name: Compile
+    - name: Update xmake repository
+      run: xmake repo --update
+
+    - name: Configure & Install dependencies
+      run: |
+        xmake f ${{ matrix.compiler.xmake-toolchain }} --runtimes="c++_shared" --enable_tests=y -v --yes
+
+    - name: Build
       run: |
-        xmake f ${{ matrix.compiler.xmake-toolchain }} --runtimes="c++_shared" --enable_tests=y --yes
-        xmake build -vD
+        xmake build -v
 
     - name: Run tests
       run: |

.github/workflows/ci-cpp-macos.yml

@@ -17,22 +17,25 @@ jobs:
         }
     steps:
     - uses: actions/checkout@v4
+
+    - uses: tecolicom/actions-use-homebrew-tools@v1
+      with:
+        tools: llvm ninja cmake
+
     - uses: xmake-io/github-action-setup-xmake@v1
       with:
         xmake-version: branch@master
 
-    - name: Install LLVM
-      if: ${{ matrix.compiler.name == 'Clang' }}
+    - name: Update xmake repository
+      run: xmake repo --update
+
+    - name: Configure & Install dependencies
       run: |
-        brew install llvm
+        xmake f --toolchain=llvm --sdk="$(brew --prefix)/opt/llvm/" --runtimes="c++_shared" --enable_tests=y -v --yes
 
-    - name: Compile
-      env:
-        CC: ${{ matrix.compiler.cc }}
-        CXX: ${{ matrix.compiler.cxx }}
+    - name: Build
       run: |
-        xmake f --enable_tests=y --yes
-        xmake build -vD
+        xmake build -v
 
     - name: Run tests
       run: |

modules/Network/Socket.mpp

@@ -5,7 +5,7 @@ module;
 #if defined(OS_WINDOWS)
 #	include <winsock2.h>
 #	include <ws2tcpip.h> // for socklen_t
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) or defined(OS_MACOS)
 #	include <sys/socket.h>
 #	include <netinet/in.h>
 #	include <arpa/inet.h>
@@ -79,7 +79,7 @@ export namespace CppUtils::Network
 		{
 			IPV4 = AF_INET,
 			IPV6 = AF_INET6,
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) or defined(OS_MACOS)
 			Local = AF_UNIX
 #endif
 		};

modules/Terminal/Cursor.mpp

@@ -21,7 +21,7 @@ export namespace CppUtils::Terminal
 			consoleScreenBufferInfo.srWindow.Left,
 			consoleScreenBufferInfo.srWindow.Top};
 	}
-#elif defined(OS_MAC) or defined(OS_LINUX)
+#elif defined(OS_LINUX) or defined(OS_MACOS)
 	[[nodiscard]] inline auto getCursorPosition() -> std::expected<Container::Size2, std::string_view>
 	{
 		using namespace std::literals;
@@ -43,7 +43,7 @@ export namespace CppUtils::Terminal
 	{
 		SetConsoleCursorPosition(GetStdHandle(STD_OUTPUT_HANDLE), COORD{static_cast<SHORT>(position.x()), static_cast<SHORT>(position.y())});
 	}
-#elif defined(OS_MAC) or defined(OS_LINUX)
+#elif defined(OS_LINUX) or defined(OS_MACOS)
 	inline auto setCursorPosition([[maybe_unused]] Container::Size2 position) -> void
 	{
 		std::print("\x1b[{};{}H", position.y() + 1, position.x() + 1);

modules/Terminal/RawTerminal.mpp

@@ -2,7 +2,7 @@ module;
 
 #include <CppUtils/System/Windows.hpp>
 
-#if defined(OS_MAC) or defined(OS_LINUX)
+#if defined(OS_LINUX) or defined(OS_MACOS)
 #	include <unistd.h>
 #	include <termios.h>
 #endif
@@ -13,7 +13,7 @@ import std;
 
 export namespace CppUtils::Terminal
 {
-#if defined(OS_MAC) or defined(OS_LINUX)
+#if defined(OS_LINUX) or defined(OS_MACOS)
 	class RawTerminal final
 	{
 	public:

modules/Terminal/Size.mpp

@@ -2,7 +2,7 @@ module;
 
 #include <CppUtils/System/Windows.hpp>
 
-#if defined(OS_MAC) or defined(OS_LINUX)
+#if defined(OS_LINUX) or defined(OS_MACOS)
 #	include <sys/ioctl.h>
 #	include <unistd.h>
 #endif
@@ -18,19 +18,19 @@ export namespace CppUtils::Terminal
 	[[nodiscard]] inline auto getTerminalSize() -> Container::Size2
 	{
 		auto consoleScreenBufferInfo = CONSOLE_SCREEN_BUFFER_INFO{};
-		GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &consoleScreenBufferInfo);
+		GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), std::addressof(consoleScreenBufferInfo));
 		return Container::Size2{
 			static_cast<std::size_t>(consoleScreenBufferInfo.srWindow.Right - consoleScreenBufferInfo.srWindow.Left + 1),
 			static_cast<std::size_t>(consoleScreenBufferInfo.srWindow.Bottom - consoleScreenBufferInfo.srWindow.Top + 1)};
 	}
-#elif defined(OS_MAC) or defined(OS_LINUX)
+#elif defined(OS_LINUX) or defined(OS_MACOS)
 	[[nodiscard]] inline auto getTerminalSize() -> Container::Size2
 	{
 		auto windowsSize = winsize{};
-		ioctl(STDOUT_FILENO, TIOCGWINSZ, &windowsSize);
+		ioctl(STDOUT_FILENO, TIOCGWINSZ, std::addressof(windowsSize));
 		return Container::Size2{
-			windowsSize.ws_col,
-			windowsSize.ws_row};
+			static_cast<std::size_t>(windowsSize.ws_col),
+			static_cast<std::size_t>(windowsSize.ws_row)};
 	}
 #endif
 }

modules/Terminal/Title.mpp

@@ -21,7 +21,7 @@ export namespace CppUtils::Terminal
 		title.resize(size);
 		::GetConsoleTitleW(std::data(title), size);
 		return title;
-#elif defined(OS_MAC) or defined(OS_LINUX)
+#elif defined(OS_LINUX) or defined(OS_MACOS)
 		/*
 		using namespace std::literals;
 
@@ -41,7 +41,7 @@ export namespace CppUtils::Terminal
 	{
 #if defined(OS_WINDOWS)
 		::SetConsoleTitleW(std::data(title));
-#elif defined(OS_MAC) or defined(OS_LINUX)
+#elif defined(OS_LINUX) or defined(OS_MACOS)
 		std::print("\x1B]0;{}\a", title);
 		std::fflush(stdout);
 #endif