From cfaad642038b215fb8239875c5c8303c53241929 Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Mon, 28 Jun 2021 21:22:08 +0200 Subject: .appveyor.yml: drop old E2EE code from testing --- .appveyor.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to '.appveyor.yml') diff --git a/.appveyor.yml b/.appveyor.yml index 764d56d6..5876e94b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,22 +3,15 @@ image: Visual Studio 2017 environment: CMAKE_ARGS: '-G "NMake Makefiles JOM" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo' matrix: + - QTDIR: C:\Qt\5.9\msvc2017 # Oldest supported Qt, 32-bit + VCVARS: "vcvars32.bat" + PLATFORM: x86 - QTDIR: C:\Qt\5.13\msvc2017 # Fresh Qt, 32-bit VCVARS: "vcvars32.bat" PLATFORM: x86 - QTDIR: C:\Qt\5.13\msvc2017_64 # Fresh Qt, 64-bit VCVARS: "vcvars64.bat" PLATFORM: - - QTDIR: C:\Qt\5.9\msvc2017_64 # Oldest supported Qt, 64-bit, E2EE - VCVARS: "vcvars64.bat" - QMAKE_E2EE_ARGS: '"DEFINES += Quotient_E2EE_ENABLED USE_INTREE_LIBQOLM" "INCLUDEPATH += olm/include" "LIBS += -Lbuild/olm"' - CMAKE_E2EE_ARGS: '-DQuotient_ENABLE_E2EE=ON -DOlm_DIR=build/olm' - PLATFORM: - - QTDIR: C:\Qt\5.13\msvc2017_64 # Fresh Qt, 64-bit, E2EE - VCVARS: "vcvars64.bat" - QMAKE_E2EE_ARGS: '"DEFINES += Quotient_E2EE_ENABLED USE_INTREE_LIBQOLM" "INCLUDEPATH += olm/include" "LIBS += -Lbuild/olm"' - CMAKE_E2EE_ARGS: '-DQuotient_ENABLE_E2EE=ON -DOlm_DIR=build/olm' - PLATFORM: init: - call "%QTDIR%\bin\qtenv2.bat" @@ -28,15 +21,10 @@ init: before_build: - git submodule update --init --recursive -- git clone https://gitlab.matrix.org/matrix-org/olm.git -- cmake %CMAKE_ARGS% -Holm -Bbuild/olm -- cmake --build build/olm build_script: -- cmake %CMAKE_ARGS% %CMAKE_E2EE_ARGS% -H. -Bbuild +- cmake %CMAKE_ARGS% -H. -Bbuild - cmake --build build -# qmake uses olm just built by CMake - it can't build olm on its own. -- qmake -Wall quotest.pro -- %QMAKE_E2EE_ARGS% && jom #after_build: #- cmake --build build --target install -- cgit v1.2.3 From ab61344a34fea54d540afbff875abe92d68cf529 Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Mon, 28 Jun 2021 21:31:38 +0200 Subject: .appveyor.yml: use an existing Qt 5.9 config --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.appveyor.yml') diff --git a/.appveyor.yml b/.appveyor.yml index 5876e94b..f6c04580 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,7 +3,7 @@ image: Visual Studio 2017 environment: CMAKE_ARGS: '-G "NMake Makefiles JOM" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo' matrix: - - QTDIR: C:\Qt\5.9\msvc2017 # Oldest supported Qt, 32-bit + - QTDIR: C:\Qt\5.9\msvc2017_64 # Oldest supported Qt, 64-bit VCVARS: "vcvars32.bat" PLATFORM: x86 - QTDIR: C:\Qt\5.13\msvc2017 # Fresh Qt, 32-bit -- cgit v1.2.3 From 3e0483df2d7c9d95ae633a03e792b65455cf0d1b Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Mon, 28 Jun 2021 22:45:55 +0200 Subject: .appveyor.yml: typo fix --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.appveyor.yml') diff --git a/.appveyor.yml b/.appveyor.yml index f6c04580..01891ed8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,7 +4,7 @@ environment: CMAKE_ARGS: '-G "NMake Makefiles JOM" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo' matrix: - QTDIR: C:\Qt\5.9\msvc2017_64 # Oldest supported Qt, 64-bit - VCVARS: "vcvars32.bat" + VCVARS: "vcvars64.bat" PLATFORM: x86 - QTDIR: C:\Qt\5.13\msvc2017 # Fresh Qt, 32-bit VCVARS: "vcvars32.bat" -- cgit v1.2.3 From 0735daf3c905c2758aa89dff02570789804b9e8f Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Tue, 29 Jun 2021 08:54:55 +0200 Subject: .appveyor.yml: And another typo fix --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.appveyor.yml') diff --git a/.appveyor.yml b/.appveyor.yml index 01891ed8..e0bf14a7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,7 +5,7 @@ environment: matrix: - QTDIR: C:\Qt\5.9\msvc2017_64 # Oldest supported Qt, 64-bit VCVARS: "vcvars64.bat" - PLATFORM: x86 + PLATFORM: - QTDIR: C:\Qt\5.13\msvc2017 # Fresh Qt, 32-bit VCVARS: "vcvars32.bat" PLATFORM: x86 -- cgit v1.2.3