From 9c8c0c158e19299cce7c1f2d5f447fe5066cbea9 Mon Sep 17 00:00:00 2001 From: sdixon Date: Fri, 30 Aug 2024 13:37:17 +0100 Subject: [PATCH] changing windows ci test to build client-only --- .github/workflows/cmake.yml | 9 ++++++++- source/server/createXDRStream.cpp | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c89c228d..c8c7b381 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -21,8 +21,15 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] release: [Release] ssl: [ON, OFF] - client-only: [OFF] + client-only: [ON, OFF] capnp: [ON, OFF] + exclude: + - os: windows-latest + client-only: OFF + - os: ubuntu-latest + client-only: ON + - os: macos-latest + client-only: ON runs-on: ${{ matrix.os }} diff --git a/source/server/createXDRStream.cpp b/source/server/createXDRStream.cpp index f686ab99..e397221e 100755 --- a/source/server/createXDRStream.cpp +++ b/source/server/createXDRStream.cpp @@ -18,7 +18,7 @@ std::pair serverCreateXDRStream(IoData* io_data) #if !defined(FATCLIENT) && defined(SSLAUTHENTICATION) if (getUdaServerSSLDisabled()) { -#if defined (__APPLE__) || defined(__TIRPC__) +#if defined (__APPLE__) || defined(__TIRPC__) || defined(_WIN32) xdrrec_create( &server_output, DB_READ_BLOCK_SIZE, DB_WRITE_BLOCK_SIZE, io_data, reinterpret_cast(server_read), reinterpret_cast(server_write)); @@ -36,7 +36,7 @@ std::pair serverCreateXDRStream(IoData* io_data) reinterpret_cast(server_write)); #endif } else { -#if defined (__APPLE__) || defined(__TIRPC__) +#if defined (__APPLE__) || defined(__TIRPC__) || defined(_WIN32) xdrrec_create( &server_output, DB_READ_BLOCK_SIZE, DB_WRITE_BLOCK_SIZE, io_data, reinterpret_cast(readUdaServerSSL), reinterpret_cast(writeUdaServerSSL)); @@ -56,7 +56,7 @@ std::pair serverCreateXDRStream(IoData* io_data) } #else // SSLAUTHENTICATION -#if defined (__APPLE__) || defined(__TIRPC__) +#if defined (__APPLE__) || defined(__TIRPC__) || defined(_WIN32) xdrrec_create(&server_output, DB_READ_BLOCK_SIZE, DB_WRITE_BLOCK_SIZE, io_data, reinterpret_cast(server_read), reinterpret_cast(server_write));