diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-09-17 13:21:35 +0200 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-09-21 15:34:53 +0200 |
| commit | a0cc4eaf6af6f047e32713b2926f784fa4087a64 (patch) | |
| tree | 93719f7ab80d85480639303a49bbd846d2363087 | |
| parent | 82e23011e0336a719fe3f2c003496d112bc5ca65 (diff) | |
| download | libquotient-a0cc4eaf6af6f047e32713b2926f784fa4087a64.tar.gz libquotient-a0cc4eaf6af6f047e32713b2926f784fa4087a64.zip | |
Bump required Olm version to 3.2.5
This is the earliest version shipping olm/error.h. Conversely, stock
libolm that comes with Ubuntu 20.04 (version 3.1.3) is no more enough
so CI completely switches to jammy now.
| -rw-r--r-- | .github/workflows/ci.yml | 8 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README.md | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f84356b0..1c0940eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false max-parallel: 1 matrix: - os: [ ubuntu-20.04, macos-11 ] + os: [ ubuntu-22.04, macos-11 ] qt-version: [ '6.3.1', '5.15.2' ] compiler: [ LLVM ] # Not using binary values here, to make the job captions more readable @@ -31,7 +31,7 @@ jobs: exclude: - qt-version: '6.3.1' update-api: update-api # Generated code is not specific to Qt version - - os: ubuntu-20.04 + - os: ubuntu-22.04 e2ee: e2ee # Will be re-added with static analysis below # TODO: Enable E2EE on Windows and macOS - os: macos-11 @@ -42,7 +42,7 @@ jobs: compiler: MSVC platform: x64 qt-arch: win64_msvc2019_64 - - os: ubuntu-20.04 + - os: ubuntu-22.04 qt-version: '5.15.2' compiler: LLVM e2ee: e2ee @@ -57,7 +57,7 @@ jobs: compiler: GCC e2ee: e2ee update-api: update-api - - os: ubuntu-20.04 + - os: ubuntu-22.04 qt-version: '5.15.2' compiler: LLVM update-api: update-api diff --git a/CMakeLists.txt b/CMakeLists.txt index 91ee8217..a56115e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,7 +101,7 @@ find_package(${Qt}Keychain REQUIRED) if (${PROJECT_NAME}_ENABLE_E2EE) find_package(${Qt} ${QtMinVersion} REQUIRED Sql) - find_package(Olm 3.1.3 REQUIRED) + find_package(Olm 3.2.5 REQUIRED) set_package_properties(Olm PROPERTIES DESCRIPTION "Implementation of the Olm and Megolm cryptographic ratchets" URL "https://gitlab.matrix.org/matrix-org/olm" @@ -47,7 +47,7 @@ your application, as described below. - GCC 11 (Windows, Linux, macOS), Clang 11 (Linux), Apple Clang 12 (macOS) and Visual Studio 2019 (Windows) are the oldest officially supported. - If using E2EE (beta, as of libQuotient 0.7): - - libolm 3.x (the latest 3.x strongly recommended) + - libolm 3.2.5 or newer (the latest 3.x strongly recommended) - OpenSSL (1.1.x is known to work; 3.x should likely work too). - Any build system that works with CMake should be fine: GNU Make and ninja on any platform, NMake and jom on Windows are known to work. |