Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/ci.macos.arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ jobs:
- name: Build
run: |
cmake -B ${{github.workspace}}/build \
<<<<<<< HEAD
=======
-D PHOTON_CXX_STANDARD=17 \
>>>>>>> 262c468 (Pick mac ci from 0.8 back to 0.7 so it able to compile unittests)
-D PHOTON_ENABLE_ECOSYSTEM=ON \
-D PHOTON_BUILD_TESTING=ON \
-D CMAKE_BUILD_TYPE=MinSizeRel \
Expand All @@ -37,4 +41,4 @@ jobs:

- name: Test
working-directory: ${{github.workspace}}/build
run: ctest -E test-lockfree --timeout 3600 -V
run: ctest -E test-lockfree --timeout 3600 -V
41 changes: 41 additions & 0 deletions .github/workflows/ci.macos.x86.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: macOS x86_64

on:
push:
branches: [ "main", "release/*" ]
pull_request:
branches: [ "main", "release/*" ]

jobs:
macOS13-x86:
runs-on: macos-13

steps:
- uses: szenius/set-timezone@v2.0
with:
timezoneLinux: "Asia/Shanghai"
timezoneMacos: "Asia/Shanghai"
timezoneWindows: "China Standard Time"

- uses: actions/checkout@v4

- name: Install Dependencies
shell: bash
run: |
brew install openssl gflags googletest gsasl nasm

- name: Build
run: |
cmake -B ${{github.workspace}}/build \
-D PHOTON_CXX_STANDARD=17 \
-D PHOTON_ENABLE_ECOSYSTEM=ON \
-D PHOTON_BUILD_TESTING=ON \
-D CMAKE_BUILD_TYPE=MinSizeRel \
-D PHOTON_ENABLE_SASL=ON \
-D PHOTON_ENABLE_LIBCURL=ON \
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3
cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)

- name: Test
working-directory: ${{github.workspace}}/build
run: ctest -E test-lockfree --timeout 3600 -V
1 change: 1 addition & 0 deletions net/http/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ class ClientImpl : public Client {
resp.reset((char *)buf, kMinimalHeadersSize, true, sock.release(), true, req.verb());
}
if (op->resp.receive_header(tmo.timeout()) != 0) {
sock->close();
req.reset_status();
LOG_ERROR_RETURN(0, ROUNDTRIP_NEED_RETRY, "read response header failed");
}
Expand Down
Loading