diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0dbc2a..27e1c1b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,42 +91,3 @@ jobs: run: test_connection.exe identity quick lane_quick_queueanddrain lane_quick_priority_and_background shell: cmd - build-and-test-osx: - name: Build And Test MacOS - runs-on: macos-latest - steps: - - uses: actions/checkout@v3 - - name: Install Vcpkg - run: | - git clone https://github.com/Microsoft/vcpkg.git - cd vcpkg - ./bootstrap-vcpkg.sh - ./vcpkg integrate install - - - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake - -DBUILD_TESTS=ON - - - name: Build - # Build the program with the given configuration - run: cmake --build ${{github.workspace}}/build --config Release - - - name: Test - working-directory: ${{github.workspace}}/build - # Execute tests defined by the CMake configuration. - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest -C Release - - - name: Test crypto - working-directory: ${{github.workspace}}/build/bin - run: ./test_crypto - shell: bash - - - name: Test connection - working-directory: ${{github.workspace}}/build/bin - run: ./test_connection identity quick lane_quick_queueanddrain lane_quick_priority_and_background - shell: bash diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml new file mode 100644 index 0000000..9151848 --- /dev/null +++ b/.github/workflows/macos.yml @@ -0,0 +1,44 @@ +name: MacOS +on: [push, pull_request] + +jobs: + + build-and-test-macos: + name: Build And Test MacOS + runs-on: macos-latest + steps: + - uses: actions/checkout@v3 + - name: Install Vcpkg + run: | + git clone https://github.com/Microsoft/vcpkg.git + cd vcpkg + ./bootstrap-vcpkg.sh + ./vcpkg integrate install + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake + -DBUILD_TESTS=ON + + - name: Build + # Build the program with the given configuration + run: cmake --build ${{github.workspace}}/build --config Release + + #- name: Test + # working-directory: ${{github.workspace}}/build + # # Execute tests defined by the CMake configuration. + # # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + # run: ctest -C Release + + - name: Test crypto + working-directory: ${{github.workspace}}/build/bin + run: ./test_crypto + shell: bash + + - name: Test connection + working-directory: ${{github.workspace}}/build/bin + run: ./test_connection identity quick lane_quick_queueanddrain lane_quick_priority_and_background + shell: bash diff --git a/README.md b/README.md index b64f475..5817d7e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # GameNetworkingSockets -[![Windows, Ubuntu, OSX](https://github.com/ValveSoftware/GameNetworkingSockets/actions/workflows/build.yml/badge.svg)](https://github.com/ValveSoftware/GameNetworkingSockets/actions) [![Linux flavors](https://github.com/ValveSoftware/GameNetworkingSockets/actions/workflows/linux-flavors.yml/badge.svg)](https://github.com/ValveSoftware/GameNetworkingSockets/actions) +[![Windows, Ubuntu](https://github.com/ValveSoftware/GameNetworkingSockets/actions/workflows/build.yml/badge.svg)](https://github.com/ValveSoftware/GameNetworkingSockets/actions) [![MacOS](https://github.com/ValveSoftware/GameNetworkingSockets/actions/workflows/macos.yml/badge.svg)](https://github.com/ValveSoftware/GameNetworkingSockets/actions) [![Linux flavors](https://github.com/ValveSoftware/GameNetworkingSockets/actions/workflows/linux-flavors.yml/badge.svg)](https://github.com/ValveSoftware/GameNetworkingSockets/actions) GameNetworkingSockets is a basic transport layer for games. The features are: