BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-04 00:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix github actions dependencies for linux to use proper boost version

Browse Source
This commit is contained in:
Lion Kortlepel 2022-10-06 00:36:57 +02:00
parent c42a523532
commit 917e3f98ab
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cmake-linux.yml vendored
View File

@ -25,7 +25,7 @@ jobs:
run: | run: |
echo ${#beammp_sentry_url} echo ${#beammp_sentry_url}
sudo apt-get update sudo apt-get update
sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev cmake g++-10 libboost-all-dev sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev cmake g++-10 libboost-dev
- name: Create Build Environment - name: Create Build Environment
run: cmake -E make_directory ${{github.workspace}}/build-linux run: cmake -E make_directory ${{github.workspace}}/build-linux

2
.github/workflows/release-build.yml vendored
View File

@ -42,7 +42,7 @@ jobs:
- name: Install Dependencies - name: Install Dependencies
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev libboost-all-dev sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev libboost-dev
- name: Create Build Environment - name: Create Build Environment
run: cmake -E make_directory ${{github.workspace}}/build-linux run: cmake -E make_directory ${{github.workspace}}/build-linux

1
src/TNetwork.cpp
View File

@ -152,7 +152,6 @@ void TNetwork::TCPServerMain() {
if (ec) { if (ec) {
beammp_errorf("failed to accept: {}", ec.what()); beammp_errorf("failed to accept: {}", ec.what());
} }
//ClientSocket.set_option(boost::asio::detail::socket_option::integer<SOL_SOCKET, SO_SNDTIMEO> { 30 * 1000 }, ec);
if (!ec) { if (!ec) {
beammp_errorf("failed to set send timeout on client socket: {}", ec.what()); beammp_errorf("failed to set send timeout on client socket: {}", ec.what());
} }