From f9d6f7224a9f47e20a2f7b6366a0cd241ffb74e8 Mon Sep 17 00:00:00 2001 From: russnic Date: Wed, 10 Apr 2024 11:50:53 +0100 Subject: [PATCH] Fix for aws-sdk-cpp log interface change - issue 44 Updating github actions to fix CI issue Adding sudo for ldconfig Only run ldconfig on linux --- .github/workflows/c-cpp.yml | 7 +++++-- src/gsts3multipartuploader.cpp | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 2980481..f77ebe1 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -31,10 +31,13 @@ jobs: brew install --overwrite gstreamer - uses: actions/checkout@v3 - run: pip3 install meson ninja - - run: 'git clone --recurse-submodules --depth 1 https://github.com/aws/aws-sdk-cpp.git -b 1.10.30' - - run: cmake -DBUILD_ONLY="s3;sts" aws-sdk-cpp + - run: 'git clone --recurse-submodules --depth 1 https://github.com/aws/aws-sdk-cpp.git -b 1.11.304' + - run: cmake -DCMAKE_PREFIX_PATH=/usr/local/ -DCMAKE_INSTALL_PREFIX=/usr/local/ -DBUILD_ONLY="s3;sts" aws-sdk-cpp - run: make -j 4 - run: sudo make install + - name: Run ldconfig on linux + if: runner.os == 'Linux' + run: sudo ldconfig - run: meson build - run: ninja -C build - run: 'export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH' diff --git a/src/gsts3multipartuploader.cpp b/src/gsts3multipartuploader.cpp index 8415435..bafc436 100644 --- a/src/gsts3multipartuploader.cpp +++ b/src/gsts3multipartuploader.cpp @@ -68,6 +68,10 @@ class Logger : public Aws::Utils::Logging::LogSystemInterface va_end (varargs); } + void vaLog(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* formatStr, va_list args) override + { + } + void LogStream(Aws::Utils::Logging::LogLevel log_level, const char* tag, const Aws::OStringStream &message_stream) override { Log(log_level, tag, "%s", message_stream.str().c_str());