mirror of
https://github.com/BeamMP/BeamMP-Server.git
synced 2026-02-16 10:41:01 +00:00
Actions fix (#11)
* update workflows to accomodate new requirements * add boost to vkpkg * try without boost again * use boost just boost * might cache vcpkg or might not idk * dont pull everything in boost * clean up includes * fix 1 * fix 2 * fix 3 * fix 4 * fix id 6 * remove libssl again * move to boost 1.71 * add boost to windows cmake * change from boost 1.71 to 1.70 * fix cmake again * remove version because f cmake * remove stuff again * fix my mistakes * fix linker args for unix * openssl * add openssl to vcpkg * uhh change whats linked * rename OpenSSL to OPENSSL????
This commit is contained in:
6
.github/workflows/cmake-linux.yml
vendored
6
.github/workflows/cmake-linux.yml
vendored
@@ -13,7 +13,11 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Install Dependencies
|
||||
run: sudo apt-get update && sudo apt-get install -y libz-dev rapidjson-dev libcurl4-openssl-dev liblua5.3
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev
|
||||
sudo add-apt-repository ppa:mhier/libboost-latest
|
||||
sudo apt-get install -y libboost1.70-dev libboost1.70
|
||||
|
||||
- name: Create Build Environment
|
||||
run: cmake -E make_directory ${{github.workspace}}/build-linux
|
||||
|
||||
5
.github/workflows/cmake-windows.yml
vendored
5
.github/workflows/cmake-windows.yml
vendored
@@ -17,15 +17,16 @@ jobs:
|
||||
uses: lukka/run-vcpkg@main
|
||||
id: runvcpkg
|
||||
with:
|
||||
vcpkgArguments: 'lua zlib rapidjson curl'
|
||||
vcpkgArguments: 'lua zlib rapidjson boost-beast boost-asio openssl'
|
||||
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
||||
vcpkgGitCommitId: '30124253eecff36bc90f73341edbfb4f845e2a1e'
|
||||
vcpkgTriplet: 'x64-windows-static'
|
||||
appendedCacheKey: ${{ hashFiles( '**/vcpkg_manifest/vcpkg.json' ) }}
|
||||
additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
|
||||
|
||||
- name: Create Build Environment
|
||||
run: cmake -E make_directory ${{github.workspace}}/build-windows
|
||||
|
||||
#
|
||||
- name: Configure CMake
|
||||
shell: bash
|
||||
working-directory: ${{github.workspace}}/build-windows
|
||||
|
||||
Reference in New Issue
Block a user