-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into rwnode
# Conflicts: # Development/cmake/NmosCppLibraries.cmake # Development/nmos-cpp-node/config.json # Development/nmos-cpp-node/node_implementation.cpp # Development/nmos/json_schema.cpp # Development/nmos/json_schema.h # Development/nmos/node_server.cpp # Development/nmos/node_server.h # Development/nmos/settings.h # Development/third_party/README.md # README.md
- Loading branch information
Showing
203 changed files
with
25,127 additions
and
2,115 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,16 @@ | ||
| - name: install conan | ||
| if: matrix.use_conan == true | ||
| run: | | ||
| pip install conan~=1.47 | ||
| conan config set general.revisions_enabled=1 | ||
| pip install conan~=2.4.1 | ||
| - name: install cmake | ||
| - name: 'ubuntu-14.04: install cmake' | ||
| if: matrix.os == 'ubuntu-14.04' | ||
| uses: lukka/[email protected] | ||
|
|
||
| - name: install cmake | ||
| if: matrix.os != 'ubuntu-14.04' | ||
| uses: lukka/[email protected] | ||
|
|
||
| - name: setup bash path | ||
| working-directory: ${{ env.GITHUB_WORKSPACE }} | ||
| shell: bash | ||
|
|
@@ -19,7 +23,7 @@ | |
| if: runner.os == 'Windows' | ||
| run: | | ||
| # set compiler to cl.exe to avoid building with gcc. | ||
| echo "CMAKE_EXTRA_ARGS=${{ env.CMAKE_EXTRA_ARGS }} -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV | ||
| echo "CMAKE_COMPILER_ARGS=-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV | ||
| # disable unused network interface | ||
| netsh interface set interface name="vEthernet (nat)" admin=DISABLED | ||
| # get host IP address | ||
|
|
@@ -142,20 +146,18 @@ | |
| libssl-dev | ||
| cd ${{ env.RUNNER_WORKSPACE }} | ||
| git clone --recurse-submodules --branch v2.10.18 https://github.com/Microsoft/cpprestsdk | ||
| git clone --recurse-submodules --branch v2.10.19 https://github.com/Microsoft/cpprestsdk | ||
| cd cpprestsdk/Release | ||
| mkdir build | ||
| cd build | ||
| cmake .. -DCMAKE_BUILD_TYPE:STRING="Release" -DWERROR:BOOL="0" -DBUILD_SAMPLES:BOOL="0" -DBUILD_TESTS:BOOL="0" | ||
| make -j 2 && sudo make install | ||
| echo "CMAKE_EXTRA_ARGS=${{ env.CMAKE_EXTRA_ARGS }} -DWEBSOCKETPP_INCLUDE_DIR:PATH=\"${{ env.RUNNER_WORKSPACE }}/cpprestsdk/Release/libs/websocketpp\"" >> $GITHUB_ENV | ||
| - name: disable conan | ||
| if: matrix.use_conan == false | ||
| shell: bash | ||
| run: | | ||
| echo "CMAKE_EXTRA_ARGS=${{ env.CMAKE_EXTRA_ARGS }} -DNMOS_CPP_USE_CONAN:BOOL=\"0\"" >> $GITHUB_ENV | ||
| echo "CMAKE_EXTRA_ARGS=${{ env.CMAKE_EXTRA_ARGS }}" \ | ||
| "-DWEBSOCKETPP_INCLUDE_DIR:PATH=\"${{ env.RUNNER_WORKSPACE }}/cpprestsdk/Release/libs/websocketpp\"" \ | ||
| "-DNMOS_CPP_USE_SUPPLIED_JSON_SCHEMA_VALIDATOR:BOOL=\"1\"" \ | ||
| "-DNMOS_CPP_USE_SUPPLIED_JWT_CPP:BOOL=\"1\"" \ | ||
| >> $GITHUB_ENV | ||
| - name: ubuntu avahi setup | ||
| if: runner.os == 'Linux' && matrix.install_mdns == false | ||
|
|
@@ -172,7 +174,17 @@ | |
| echo "CMAKE_EXTRA_ARGS=${{ env.CMAKE_EXTRA_ARGS }} -DNMOS_CPP_USE_AVAHI:BOOL=\"1\"" >> $GITHUB_ENV | ||
| - name: force cpprest asio | ||
| if: matrix.force_cpprest_asio == true | ||
| if: matrix.force_cpprest_asio == true && matrix.use_conan == true | ||
| shell: bash | ||
| run: | | ||
| echo "CONAN_INSTALL_EXTRA_ARGS=--options\;cpprestsdk/*:http_client_impl=asio\;--options\;cpprestsdk/*:http_listener_impl=asio" >> $GITHUB_ENV | ||
| - name: enable conan | ||
| if: matrix.use_conan == true | ||
| shell: bash | ||
| run: | | ||
| echo "CMAKE_EXTRA_ARGS=${{ env.CMAKE_EXTRA_ARGS }} -DNMOS_CPP_CONAN_OPTIONS:STRING=\"cpprestsdk:http_client_impl=asio;cpprestsdk:http_listener_impl=asio\"" >> $GITHUB_ENV | ||
| echo "CMAKE_EXTRA_ARGS=${{ env.CMAKE_EXTRA_ARGS }}" \ | ||
| "-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES:STRING=\"third_party/cmake/conan_provider.cmake\"" \ | ||
| "-DCONAN_INSTALL_ARGS:STRING=\"--build=missing\;${{ env.CONAN_INSTALL_EXTRA_ARGS }}\;--lockfile-out=conan.lock\"" \ | ||
| >> $GITHUB_ENV | ||
| cat $GITHUB_ENV | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,16 @@ | ||
| - uses: ilammy/msvc-dev-cmd@v1 | ||
| - name: setup developer command prompt for Microsoft Visual C++ | ||
| if: runner.os == 'Windows' | ||
| uses: ilammy/msvc-dev-cmd@v1 | ||
|
|
||
| - name: build | ||
| uses: lukka/[email protected] | ||
| with: | ||
| cmakeListsOrSettingsJson: CMakeListsTxtAdvanced | ||
| cmakeListsTxtPath: '${{ env.GITHUB_WORKSPACE }}/Development/CMakeLists.txt' | ||
| buildDirectory: '${{ env.RUNNER_WORKSPACE }}/build/' | ||
| cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ env.RUNNER_WORKSPACE }}/install" ${{ env.CMAKE_EXTRA_ARGS }}' | ||
| cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ env.RUNNER_WORKSPACE }}/install" ${{ env.CMAKE_COMPILER_ARGS }} ${{ env.CMAKE_EXTRA_ARGS }}' | ||
|
|
||
| - name: dump conan lockfile | ||
| if: matrix.use_conan == true | ||
| run: | | ||
| cat ${{ env.RUNNER_WORKSPACE }}/build/conan.lock |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.