Skip to content

Commit 262c468

Browse files
committed
Pick mac ci from 0.8 back to 0.7 so it able to compile unittests
1 parent 28361ec commit 262c468

2 files changed

Lines changed: 42 additions & 31 deletions

File tree

.github/workflows/ci.macos.arm.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,31 @@ jobs:
1111
runs-on: macos-14
1212

1313
steps:
14-
- uses: szenius/set-timezone@v1.2
14+
- uses: szenius/set-timezone@v2.0
1515
with:
1616
timezoneLinux: "Asia/Shanghai"
1717
timezoneMacos: "Asia/Shanghai"
1818
timezoneWindows: "China Standard Time"
1919

20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
- name: Install Dependencies
2323
shell: bash
2424
run: |
25-
brew install cmake openssl gflags googletest gsasl
25+
brew install openssl gflags googletest gsasl
2626
2727
- name: Build
2828
run: |
29-
cmake -B ${{github.workspace}}/build -D PHOTON_BUILD_TESTING=ON -D CMAKE_BUILD_TYPE=Release \
30-
-D PHOTON_ENABLE_SASL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3
31-
cmake --build ${{github.workspace}}/build -j $(nproc)
29+
cmake -B ${{github.workspace}}/build \
30+
-D PHOTON_CXX_STANDARD=17 \
31+
-D PHOTON_ENABLE_ECOSYSTEM=ON \
32+
-D PHOTON_BUILD_TESTING=ON \
33+
-D CMAKE_BUILD_TYPE=MinSizeRel \
34+
-D PHOTON_ENABLE_SASL=ON \
35+
-D PHOTON_ENABLE_LIBCURL=ON \
36+
-D OPENSSL_ROOT_DIR=/opt/homebrew/Cellar/openssl@1.1/1.1.1w
37+
cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)
3238
3339
- name: Test
3440
working-directory: ${{github.workspace}}/build
35-
run: ctest -E test-lockfree --timeout 3600 -V
41+
run: ctest -E test-lockfree --timeout 3600 -V

.github/workflows/ci.macos.x86.yml

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: macOS
1+
name: macOS x86_64
22

33
on:
44
push:
@@ -11,26 +11,31 @@ jobs:
1111
runs-on: macos-13
1212

1313
steps:
14-
- uses: szenius/set-timezone@v1.2
15-
with:
16-
timezoneLinux: "Asia/Shanghai"
17-
timezoneMacos: "Asia/Shanghai"
18-
timezoneWindows: "China Standard Time"
19-
20-
- uses: actions/checkout@v3
21-
22-
- name: Install Dependencies
23-
shell: bash
24-
run: |
25-
brew install cmake openssl gflags googletest gsasl
26-
27-
- name: Build
28-
run: |
29-
cmake -B ${{github.workspace}}/build -D PHOTON_BUILD_TESTING=ON -D CMAKE_BUILD_TYPE=Release \
30-
-D PHOTON_ENABLE_SASL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3
31-
cmake --build ${{github.workspace}}/build -j $(nproc)
32-
33-
- name: Test
34-
working-directory: ${{github.workspace}}/build
35-
run: ctest -E test-lockfree --timeout 3600 -V
36-
14+
- uses: szenius/set-timezone@v2.0
15+
with:
16+
timezoneLinux: "Asia/Shanghai"
17+
timezoneMacos: "Asia/Shanghai"
18+
timezoneWindows: "China Standard Time"
19+
20+
- uses: actions/checkout@v4
21+
22+
- name: Install Dependencies
23+
shell: bash
24+
run: |
25+
brew install openssl gflags googletest gsasl nasm
26+
27+
- name: Build
28+
run: |
29+
cmake -B ${{github.workspace}}/build \
30+
-D PHOTON_CXX_STANDARD=17 \
31+
-D PHOTON_ENABLE_ECOSYSTEM=ON \
32+
-D PHOTON_BUILD_TESTING=ON \
33+
-D CMAKE_BUILD_TYPE=MinSizeRel \
34+
-D PHOTON_ENABLE_SASL=ON \
35+
-D PHOTON_ENABLE_LIBCURL=ON \
36+
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3
37+
cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)
38+
39+
- name: Test
40+
working-directory: ${{github.workspace}}/build
41+
run: ctest -E test-lockfree --timeout 3600 -V

0 commit comments

Comments
 (0)