Skip to content

Commit ce581b8

Browse files
committed
CI MacOS
1 parent 09915d1 commit ce581b8

3 files changed

Lines changed: 23 additions & 14 deletions

File tree

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,16 @@ jobs:
4949
if: ${{ matrix.compiler.name == 'Latest Clang' }}
5050
uses: MorganCaron/latest-clang-action@master
5151

52-
- name: Compile
52+
- name: Update xmake repository
53+
run: xmake repo --update
54+
55+
- name: Configure & Install dependencies
56+
run: |
57+
xmake f ${{ matrix.compiler.xmake-toolchain }} --runtimes="c++_shared" --enable_tests=y -v --yes
58+
59+
- name: Build
5360
run: |
54-
xmake f ${{ matrix.compiler.xmake-toolchain }} --runtimes="c++_shared" --enable_tests=y --yes
55-
xmake build -vD
61+
xmake build -v
5662
5763
- name: Run tests
5864
run: |

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,25 @@ jobs:
1717
}
1818
steps:
1919
- uses: actions/checkout@v4
20+
21+
- uses: tecolicom/actions-use-homebrew-tools@v1
22+
with:
23+
tools: llvm ninja cmake
24+
2025
- uses: xmake-io/github-action-setup-xmake@v1
2126
with:
2227
xmake-version: branch@master
2328

24-
- name: Install LLVM
25-
if: ${{ matrix.compiler.name == 'Clang' }}
29+
- name: Update xmake repository
30+
run: xmake repo --update
31+
32+
- name: Configure & Install dependencies
2633
run: |
27-
brew install llvm
34+
xmake f --toolchain=llvm --sdk="$(brew --prefix)/opt/llvm/" --runtimes="c++_shared" --enable_tests=y -v --yes
2835
29-
- name: Compile
30-
env:
31-
CC: ${{ matrix.compiler.cc }}
32-
CXX: ${{ matrix.compiler.cxx }}
36+
- name: Build
3337
run: |
34-
xmake f --enable_tests=y --yes
35-
xmake build -vD
38+
xmake build -v
3639
3740
- name: Run tests
3841
run: |

modules/Network/Socket.mpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module;
55
#if defined(OS_WINDOWS)
66
# include <winsock2.h>
77
# include <ws2tcpip.h> // for socklen_t
8-
#elif defined(OS_LINUX)
8+
#elif defined(OS_LINUX) or defined(OS_MACOS)
99
# include <sys/socket.h>
1010
# include <netinet/in.h>
1111
# include <arpa/inet.h>
@@ -79,7 +79,7 @@ export namespace CppUtils::Network
7979
{
8080
IPV4 = AF_INET,
8181
IPV6 = AF_INET6,
82-
#if defined(OS_LINUX)
82+
#if defined(OS_LINUX) or defined(OS_MACOS)
8383
Local = AF_UNIX
8484
#endif
8585
};

0 commit comments

Comments
 (0)