From 917e3f98ab05e6a30c4ec178c8aabdcaa9b67e1a Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Thu, 6 Oct 2022 00:36:57 +0200 Subject: [PATCH] fix github actions dependencies for linux to use proper boost version --- .github/workflows/cmake-linux.yml | 2 +- .github/workflows/release-build.yml | 2 +- src/TNetwork.cpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake-linux.yml b/.github/workflows/cmake-linux.yml index a801f66..8cf22ca 100644 --- a/.github/workflows/cmake-linux.yml +++ b/.github/workflows/cmake-linux.yml @@ -25,7 +25,7 @@ jobs: run: | echo ${#beammp_sentry_url} 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 run: cmake -E make_directory ${{github.workspace}}/build-linux diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index a870080..0b6930b 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -42,7 +42,7 @@ jobs: - name: Install Dependencies run: | 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 run: cmake -E make_directory ${{github.workspace}}/build-linux diff --git a/src/TNetwork.cpp b/src/TNetwork.cpp index f472f81..f95e76e 100644 --- a/src/TNetwork.cpp +++ b/src/TNetwork.cpp @@ -152,7 +152,6 @@ void TNetwork::TCPServerMain() { if (ec) { beammp_errorf("failed to accept: {}", ec.what()); } - //ClientSocket.set_option(boost::asio::detail::socket_option::integer { 30 * 1000 }, ec); if (!ec) { beammp_errorf("failed to set send timeout on client socket: {}", ec.what()); }