From 727e6fcff093b540713dfc4689cb9c969e37a92c Mon Sep 17 00:00:00 2001 From: Gulliver Date: Tue, 30 May 2023 11:57:58 +0200 Subject: [PATCH] added asio vcpk build and windows to build platforms removed windows2019 build, chocolatey installs --- .github/workflows/build_and_test.yml | 29 +++++++++++++--------------- vcpkg.json | 2 +- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3210ac31a..f9fcd0661 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,5 +1,6 @@ name: Build and test (cmake based build) +#on: push on: push: branches: [ "master" ] @@ -17,14 +18,14 @@ jobs: # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix runs-on: ${{ matrix.os }} strategy: - fail-fast: false + fail-fast: true matrix: os: [ ubuntu-latest, ubuntu-20.04, - macos-latest, macos-11 + macos-latest, macos-11, + windows-latest ] - # ubuntu-18.04 does not work due to compile error on asio - # windows-latest, windows-2019 - wip missing asio lib install - + # ubuntu-18.04 does not work due to compile error on asio + # windows-2019 not included to spare free minutes steps: - uses: actions/checkout@v3 - name: Prepare dependencies @@ -33,13 +34,11 @@ jobs: sudo apt-get update && \ sudo apt-get install -yq \ libasio-dev \ - cmake \ - graphviz doxygen + cmake elif [ "$RUNNER_OS" == "Windows" ]; then - vcpkg install; - choco install graphviz doxygen.install + VCPKG_DEFAULT_TRIPLET=x64-windows vcpkg install elif [ "$RUNNER_OS" == "macOS" ]; then - brew install asio graphviz doxygen + brew install asio else echo "$RUNNER_OS not supported" exit 1 @@ -48,13 +47,11 @@ jobs: - name: Configure CMake run: | - if [ "$RUNNER_OS" == "Windows" ]; then - mkdir build; - cd build; - cmake .. -DCMAKE_TOOLCHAIN_FILE="%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake" .. - else + if [ "$RUNNER_OS" == "Windows" ]; then + cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -B build + else cmake -B build - fi + fi shell: bash - name: Build # Build your program with the given configuration diff --git a/vcpkg.json b/vcpkg.json index 6c5698aaa..799abab1d 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,5 @@ { - "name": "crow-examples", + "name": "crow", "version-string": "master", "dependencies": [ "asio",