Fix CI errors on macOS & Windows

- Run the linter
- Explicitly use cmake for installing olm
pull/1/head
Konstantinos Sideris 7 years ago
parent 8e9d210a2a
commit 7fc010fc4f
  1. 7
      deps/cmake/Olm.cmake
  2. 8
      src/CommunitiesList.cc
  3. 2
      src/RegisterPage.cc

@ -1,5 +1,3 @@
set(OLM_PATCH ${CMAKE_CURRENT_SOURCE_DIR}/patches/olm-CMake-Support.patch)
ExternalProject_Add(
Olm
@ -20,6 +18,9 @@ ExternalProject_Add(
${DEPS_BUILD_DIR}/olm
BUILD_COMMAND ${CMAKE_COMMAND}
--build ${DEPS_BUILD_DIR}/olm
--config Release)
--config Release
INSTALL_COMMAND ${CMAKE_COMMAND}
--build ${DEPS_BUILD_DIR}/olm
--target install)
list(APPEND THIRD_PARTY_DEPS Olm)

@ -1,5 +1,5 @@
#include "Cache.h"
#include "CommunitiesList.h"
#include "Cache.h"
#include "Logging.hpp"
#include "MatrixClient.h"
@ -137,9 +137,9 @@ CommunitiesList::fetchCommunityAvatar(const QString &id, const QString &avatarUr
opts, [this, opts, id](const std::string &res, mtx::http::RequestErr err) {
if (err) {
nhlog::net()->warn("failed to download avatar: {} - ({} {})",
opts.mxc_url,
mtx::errors::to_string(err->matrix_error.errcode),
err->matrix_error.error);
opts.mxc_url,
mtx::errors::to_string(err->matrix_error.errcode),
err->matrix_error.error);
return;
}

@ -248,7 +248,7 @@ RegisterPage::onRegisterButtonClicked()
}
nhlog::net()->warn("failed to register: status_code ({})",
static_cast<int>(err->status_code));
static_cast<int>(err->status_code));
emit registerErrorCb(QString::fromStdString(err->matrix_error.error));
emit errorOccurred();

Loading…
Cancel
Save