Skip to content

Commit

Permalink
👷 Fixed CI build
Browse files Browse the repository at this point in the history
  • Loading branch information
AnotherFoxGuy committed Apr 14, 2022
1 parent 7ae8538 commit 1fb310a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
20 changes: 18 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,24 @@ jobs:
- name: Enable Developer Command Prompt
uses: ilammy/[email protected]

- name: Get latest CMake and ninja
uses: lukka/get-cmake@latest
- name: Install deps (Ubuntu)
if: startsWith(matrix.os, 'ubuntu')
run: sudo apt-get update && sudo apt-get -y install libpoco-dev ninja-build

- run: echo "C:\apps\build-tools\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
if: startsWith(matrix.os, 'windows')

- name: Install Build tools
if: startsWith(matrix.os, 'windows')
shell: cmake -P {0}
run: |
file(MAKE_DIRECTORY "C:/apps/build-tools/")
file(DOWNLOAD https://cdn.anotherfoxguy.com/build-tools.zip "$ENV{TMP}/build-tools.zip" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/build-tools.zip" WORKING_DIRECTORY "C:/apps/build-tools/")
- name: Install deps with conan
if: startsWith(matrix.os, 'windows')
run: conan install .

- name: Configure
run: cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DRORSERVER_WITH_ANGELSCRIPT=ON .
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_BINARY_DIR})
project(rorserver)


find_package(Poco REQUIRED)
find_package(Poco REQUIRED COMPONENTS Foundation)

# setup paths
SET(RUNTIME_OUTPUT_DIRECTORY "${rorserver_SOURCE_DIR}/bin/")
Expand Down
2 changes: 1 addition & 1 deletion source/server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
${CMAKE_SOURCE_DIR}/dependencies/jsoncpp/include/
)

target_link_libraries(${PROJECT_NAME} PRIVATE Poco::Poco)
target_link_libraries(${PROJECT_NAME} PRIVATE Poco::Foundation)

# libraries
if (RORSERVER_WITH_ANGELSCRIPT)
Expand Down

0 comments on commit 1fb310a

Please sign in to comment.