From 5602a168f721f4e69ba7a83a9b06929660616170 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 19 Aug 2018 09:28:34 +0000 Subject: [PATCH 1/8] Add .appveyor.yml --- .appveyor.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..91419db --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,22 @@ +image: Visual Studio 2017 + +environment: + matrix: + - QT: C:\Qt\5.11\msvc2017_64 + +init: + - call "%QTDIR%\bin\qtenv2.bat" + - set PATH=C:\Qt\Tools\QtCreator\bin;%PATH% + - call "%VCVARS%" %platform% + - cd /D "%APPVEYOR_BUILD_FOLDER%" + +before_build: + - git submodule update --init --recursive + +build_script: + - qmake matrique.pro + - make + +artifacts: + - path: matrique.exe + name: portable \ No newline at end of file From 9469642ac2abe36b11414367c3249fca5cdad15d Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 19 Aug 2018 09:31:02 +0000 Subject: [PATCH 2/8] Update .appveyor.yml --- .appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 91419db..94b9079 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,12 +2,11 @@ image: Visual Studio 2017 environment: matrix: - - QT: C:\Qt\5.11\msvc2017_64 + - QTDIR: C:\Qt\5.11\msvc2017_64 init: - call "%QTDIR%\bin\qtenv2.bat" - set PATH=C:\Qt\Tools\QtCreator\bin;%PATH% - - call "%VCVARS%" %platform% - cd /D "%APPVEYOR_BUILD_FOLDER%" before_build: From a40c2c26491cdf33006fbb85a881ad58094c3b91 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 19 Aug 2018 09:32:35 +0000 Subject: [PATCH 3/8] Update .appveyor.yml --- .appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 94b9079..b411d57 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,10 +3,13 @@ image: Visual Studio 2017 environment: matrix: - QTDIR: C:\Qt\5.11\msvc2017_64 + VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat" + PLATFORM: init: - call "%QTDIR%\bin\qtenv2.bat" - set PATH=C:\Qt\Tools\QtCreator\bin;%PATH% + - call "%VCVARS%" %platform% - cd /D "%APPVEYOR_BUILD_FOLDER%" before_build: From 53333e27f737f2d11b057d0cf91e147e84e5c73d Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 19 Aug 2018 09:36:13 +0000 Subject: [PATCH 4/8] Update .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index b411d57..0524eb7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,7 +17,7 @@ before_build: build_script: - qmake matrique.pro - - make + - nmake artifacts: - path: matrique.exe From 8fea37a1c6b94059dd8c7a283def58ee9358ffc4 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 19 Aug 2018 09:45:31 +0000 Subject: [PATCH 5/8] Update .appveyor.yml --- .appveyor.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0524eb7..caafddc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,7 @@ image: Visual Studio 2017 environment: + DEPLOY_DIR: Matrique-%APPVEYOR_BUILD_VERSION% matrix: - QTDIR: C:\Qt\5.11\msvc2017_64 VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat" @@ -16,9 +17,13 @@ before_build: - git submodule update --init --recursive build_script: - - qmake matrique.pro + - qmake matrique.pro PREFIX="%DEPLOY_DIR%" - nmake + +after_build: + - nmake install + - 7z a matrique.zip "%DEPLOY_DIR%\" artifacts: - - path: matrique.exe + - path: matrique.zip name: portable \ No newline at end of file From 685455d7490ed0284da58f3d7617626e38acf290 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 19 Aug 2018 10:02:07 +0000 Subject: [PATCH 6/8] Update .appveyor.yml --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index caafddc..9cdb1c5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -22,6 +22,7 @@ build_script: after_build: - nmake install + - windeployqt --release --no-translations --no-angle --no-opengl-sw "%DEPLOY_DIR%\matrique.exe" - 7z a matrique.zip "%DEPLOY_DIR%\" artifacts: From 1ad6db8079c25194b214c770ae7cade78634565b Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 19 Aug 2018 10:58:48 +0000 Subject: [PATCH 7/8] Add AppVeyor artifacts. --- README.md | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b1b6011..6843e3f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Matrique -[![pipeline status](https://gitlab.com/b0/matrique/badges/master/pipeline.svg)](https://gitlab.com/b0/matrique/commits/master) -[![coverage report](https://gitlab.com/b0/matrique/badges/master/coverage.svg)](https://gitlab.com/b0/matrique/commits/master) +[![Pipeline Status](https://gitlab.com/b0/matrique/badges/master/pipeline.svg)](https://gitlab.com/b0/matrique/commits/master) +[![Build Status](https://ci.appveyor.com/api/projects/status/idt149cdxwurbukh?svg=true)](https://ci.appveyor.com/project/BlackHat/matrique) +[![Coverage Report](https://gitlab.com/b0/matrique/badges/master/coverage.svg)](https://gitlab.com/b0/matrique/commits/master) Get it on Flathub @@ -15,23 +16,22 @@ You can reach the maintainer at #matrique:matrix.org, if you are already on Matr Also, you can file an issue at this project if anything goes wrong. -## Download +## Install + +### GNU/Linux You can fetch the release of Matrique on Flathub. The link is at the beginning of this README. -Alternatively, you can download the Flatpak nightly build bundle from here: ![Download Bundle](https://gitlab.com/b0/matrique/-/jobs/artifacts/dev/raw/flatpak/matrique.flatpak?job=build-flatpak) +Alternatively, you can download the Flatpak nightly build bundle from ![Gitlab CI](https://gitlab.com/b0/matrique/-/jobs/artifacts/dev/raw/flatpak/matrique.flatpak?job=build-flatpak). Open the bundle using your preferred software center. -### Requirements +#### Requirements An operating system with Flatpak installed. Fedora 28 is known to work, other GNU/Linux distributions should work as well if they have Flatpak installed. -*P.S. In case if you haven't figured it out, the instruction above only works on Master OS. -No precompiled binary for MacOS and Microsoft Windows yet.* - -## Run +#### Run If you install Matrique through Flatpak, you should already be able to run it from the app launcher. @@ -41,6 +41,16 @@ If not, flatpak run org.eu.encom.matrique ``` +### Windows + +There are no tested builds on Windows yet, but you can fetch the nightly builds from ![AppVeyor](https://ci.appveyor.com/api/projects/BlackHat/matrique/artifacts/matrique.zip). + +Most functions should work fine, but things are expected to go wrong. Open an issue if you find any bugs. + +### MacOS + +I suggest you to check out ![Seaglass](https://github.com/neilalexander/seaglass). + ## Compile from Source You can compile Matrique from source if you want to. From 88341c6431a7e25b58157558297ed1f96023601c Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sun, 19 Aug 2018 12:06:57 +0000 Subject: [PATCH 8/8] Update .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9cdb1c5..0aa0dc3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -22,7 +22,7 @@ build_script: after_build: - nmake install - - windeployqt --release --no-translations --no-angle --no-opengl-sw "%DEPLOY_DIR%\matrique.exe" + - windeployqt --release "%DEPLOY_DIR%\matrique.exe" - 7z a matrique.zip "%DEPLOY_DIR%\" artifacts: