From e0d011e62bd29112093c41693c610be393910468 Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 18:41:16 +0430 Subject: [PATCH 1/6] update appveyor.yml script and badge [skip ci] --- README.md | 8 +++----- appveyor.yml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 673d65f..61ab559 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,9 @@ - - # Nut -[![Build Status](https://travis-ci.org/HamedMasafi/Nut.svg?branch=master)](https://travis-ci.org/HamedMasafi/Nut) +[![Travis build Status](https://travis-ci.org/HamedMasafi/Nut.svg?branch=master)](https://travis-ci.org/HamedMasafi/Nut) +[![Appveyor build Status](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?svg=true)](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?svg=true) [![GitLicense](https://gitlicense.com/badge/hamedmasafi/nut)](https://gitlicense.com/license/hamedmasafi/nut) -[![Codacy -Badge](https://api.codacy.com/project/badge/Grade/f3802610beb946068f6cd2c2b6608a8b)](https://www.codacy.com/app/HamedMasafi/Nut?utm_source=github.com&utm_medium=referral&utm_content=HamedMasafi/Nut&utm_campaign=Badge_Grade) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3802610beb946068f6cd2c2b6608a8b)](https://www.codacy.com/app/HamedMasafi/Nut?utm_source=github.com&utm_medium=referral&utm_content=HamedMasafi/Nut&utm_campaign=Badge_Grade) ## Advanced, Powerful and easy to use ORM for Qt5 diff --git a/appveyor.yml b/appveyor.yml index 14029db..81203dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,56 @@ +version: '{branch}-{build}' + +environment: + matrix: + - QTDIR: C:\Qt\5.6.3\mingw49_32 + - QTDIR: C:\Qt\5.6.3\msvc2013 + - QTDIR: C:\Qt\5.6.3\msvc2013_64 + - QTDIR: C:\Qt\5.6.3\msvc2015 + - QTDIR: C:\Qt\5.6.3\msvc2015_64 + - QTDIR: C:\Qt\5.7\mingw53_32 + - QTDIR: C:\Qt\5.7\msvc2015 + - QTDIR: C:\Qt\5.9.5\mingw53_32 + - QTDIR: C:\Qt\5.9.5\msvc2013_64 + - QTDIR: C:\Qt\5.9.5\msvc2015 + - QTDIR: C:\Qt\5.9.5\msvc2015_64 + - QTDIR: C:\Qt\5.10.1\mingw53_32 + - QTDIR: C:\Qt\5.10.1\msvc2013_64 + - QTDIR: C:\Qt\5.10.1\msvc2015 + - QTDIR: C:\Qt\5.10.1\msvc2015_64 + - QTDIR: C:\Qt\5.11.1\mingw53_32 + - QTDIR: C:\Qt\5.11.1\msvc2015 + - QTDIR: C:\Qt\5.11.1\msvc2015_64 + +configuration: + - debug + - release + +clone_script: + - cmd: git clone -q --recursive --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER% + - cmd: git checkout -qf %APPVEYOR_REPO_COMMIT% + install: - - set QTDIR=C:\Qt\5.9.2\winrt_x64_msvc2017 - - set PATH=%PATH%;%QTDIR%\bin;C:\MinGW\bin + - '%QTDIR%\bin\qtenv2.bat' + - qmake -v + - if %QTDIR:_64=%==%QTDIR% ( set ARCH=x86 ) else set ARCH=x64 + - if %QTDIR:msvc=%==%QTDIR% g++ --version + - if %QTDIR:msvc=%==%QTDIR% set make=mingw32-make.exe + - if %QTDIR:msvc=%==%QTDIR% %make% --version + - if not %QTDIR:msvc2013=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %ARCH% + - if not %QTDIR:msvc2015=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH% + - if not %QTDIR:msvc=%==%QTDIR% set make=nmake.exe + - if not %QTDIR:msvc=%==%QTDIR% %make% /? > nul + +before_build: + # Prepare the out-of-source build directory. + - mkdir %APPVEYOR_BUILD_FOLDER%-build + - qmake -o %APPVEYOR_BUILD_FOLDER%-build -r -Wall -Wlogic -Wparser CONFIG+=%CONFIGURATION% %APPVEYOR_BUILD_FOLDER% + build_script: - - qmake - - mingw32-make + - cd %APPVEYOR_BUILD_FOLDER%-build + - echo 'QT -= gui' >> %APPVEYOR_BUILD_FOLDER%\ci-test-init.pri + - '%make%' + +test_script: + # @todo output using Qt's -xunitxml option + - if not %CONFIGURATION%==debug %make% check TESTARGS=-silent From 802ad513a8dd49741f365a5059cb3f148d04adbd Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 18:48:58 +0430 Subject: [PATCH 2/6] update badge [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 61ab559..6410c7f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Nut [![Travis build Status](https://travis-ci.org/HamedMasafi/Nut.svg?branch=master)](https://travis-ci.org/HamedMasafi/Nut) -[![Appveyor build Status](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?svg=true)](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?svg=true) +[![Appveyor build Status](https://ci.appveyor.com/api/projects/status/HamedMasafi/nut?svg=true)](https://ci.appveyor.com/project/HamedMasafi/nut) [![GitLicense](https://gitlicense.com/badge/hamedmasafi/nut)](https://gitlicense.com/license/hamedmasafi/nut) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3802610beb946068f6cd2c2b6608a8b)](https://www.codacy.com/app/HamedMasafi/Nut?utm_source=github.com&utm_medium=referral&utm_content=HamedMasafi/Nut&utm_campaign=Badge_Grade) From 1f567c3432a9afa42d33ca2540ac7f990dcf61b3 Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 19:08:32 +0430 Subject: [PATCH 3/6] appveyoe new matrix --- appveyor.yml | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 81203dc..0783981 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,24 +2,34 @@ version: '{branch}-{build}' environment: matrix: - - QTDIR: C:\Qt\5.6.3\mingw49_32 - - QTDIR: C:\Qt\5.6.3\msvc2013 - - QTDIR: C:\Qt\5.6.3\msvc2013_64 - - QTDIR: C:\Qt\5.6.3\msvc2015 - - QTDIR: C:\Qt\5.6.3\msvc2015_64 - - QTDIR: C:\Qt\5.7\mingw53_32 - - QTDIR: C:\Qt\5.7\msvc2015 - - QTDIR: C:\Qt\5.9.5\mingw53_32 - - QTDIR: C:\Qt\5.9.5\msvc2013_64 - - QTDIR: C:\Qt\5.9.5\msvc2015 - - QTDIR: C:\Qt\5.9.5\msvc2015_64 - - QTDIR: C:\Qt\5.10.1\mingw53_32 - - QTDIR: C:\Qt\5.10.1\msvc2013_64 - - QTDIR: C:\Qt\5.10.1\msvc2015 - - QTDIR: C:\Qt\5.10.1\msvc2015_64 - - QTDIR: C:\Qt\5.11.1\mingw53_32 - - QTDIR: C:\Qt\5.11.1\msvc2015 - - QTDIR: C:\Qt\5.11.1\msvc2015_64 + - QTDIR: C:\\5.13.0\mingw73_64 + - QTDIR: C:\\5.13.0\mingw73_32 + - QTDIR: C:\\5.13.0\msvc2017 + - QTDIR: C:\\5.13.0\msvc2017_64 + - QTDIR: C:\\5.13.0\mingw73_64 + - QTDIR: C:\\5.13.0\mingw73_32 + - QTDIR: C:\\5.13.0\msvc2015_64 + - QTDIR: C:\\5.12.4\mingw73_64 + - QTDIR: C:\\5.12.4\mingw73_32 + - QTDIR: C:\\5.12.4\msvc2017 + - QTDIR: C:\\5.12.4\msvc2017_64 + - QTDIR: C:\\5.12.4\mingw73_64 + - QTDIR: C:\\5.12.4\mingw73_32 + - QTDIR: C:\\5.12.4\msvc2015_64 + - QTDIR: C:\\5.12.3\mingw73_64 + - QTDIR: C:\\5.12.3\mingw73_32 + - QTDIR: C:\\5.12.3\msvc2017 + - QTDIR: C:\\5.12.3\msvc2017_64 + - QTDIR: C:\\5.11.3\mingw53_32 + - QTDIR: C:\\5.11.3\msvc2015 + - QTDIR: C:\\5.10.1\msvc2017_64 + - QTDIR: C:\\5.10.1\winrt_armv7_msvc2017 + - QTDIR: C:\\5.10.1\winrt_x86_msvc2017 + - QTDIR: C:\\5.10.1\winrt_x64_msvc2017 + - QTDIR: C:\\5.9.7\msvc2017_64 + - QTDIR: C:\\5.9.7\winrt_armv7_msvc2017 + - QTDIR: C:\\5.9.7\winrt_x86_msvc2017 + - QTDIR: C:\\5.9.7\winrt_x64_msvc2017 configuration: - debug From 4ca814e4405bd40f88648b836535f5c53a283b9f Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 19:11:13 +0430 Subject: [PATCH 4/6] oops, typo in appveyor matrix --- appveyor.yml | 56 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0783981..0c68e0d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,34 +2,34 @@ version: '{branch}-{build}' environment: matrix: - - QTDIR: C:\\5.13.0\mingw73_64 - - QTDIR: C:\\5.13.0\mingw73_32 - - QTDIR: C:\\5.13.0\msvc2017 - - QTDIR: C:\\5.13.0\msvc2017_64 - - QTDIR: C:\\5.13.0\mingw73_64 - - QTDIR: C:\\5.13.0\mingw73_32 - - QTDIR: C:\\5.13.0\msvc2015_64 - - QTDIR: C:\\5.12.4\mingw73_64 - - QTDIR: C:\\5.12.4\mingw73_32 - - QTDIR: C:\\5.12.4\msvc2017 - - QTDIR: C:\\5.12.4\msvc2017_64 - - QTDIR: C:\\5.12.4\mingw73_64 - - QTDIR: C:\\5.12.4\mingw73_32 - - QTDIR: C:\\5.12.4\msvc2015_64 - - QTDIR: C:\\5.12.3\mingw73_64 - - QTDIR: C:\\5.12.3\mingw73_32 - - QTDIR: C:\\5.12.3\msvc2017 - - QTDIR: C:\\5.12.3\msvc2017_64 - - QTDIR: C:\\5.11.3\mingw53_32 - - QTDIR: C:\\5.11.3\msvc2015 - - QTDIR: C:\\5.10.1\msvc2017_64 - - QTDIR: C:\\5.10.1\winrt_armv7_msvc2017 - - QTDIR: C:\\5.10.1\winrt_x86_msvc2017 - - QTDIR: C:\\5.10.1\winrt_x64_msvc2017 - - QTDIR: C:\\5.9.7\msvc2017_64 - - QTDIR: C:\\5.9.7\winrt_armv7_msvc2017 - - QTDIR: C:\\5.9.7\winrt_x86_msvc2017 - - QTDIR: C:\\5.9.7\winrt_x64_msvc2017 + - QTDIR: C:\5.13.0\mingw73_64 + - QTDIR: C:\5.13.0\mingw73_32 + - QTDIR: C:\5.13.0\msvc2017 + - QTDIR: C:\5.13.0\msvc2017_64 + - QTDIR: C:\5.13.0\mingw73_64 + - QTDIR: C:\5.13.0\mingw73_32 + - QTDIR: C:\5.13.0\msvc2015_64 + - QTDIR: C:\5.12.4\mingw73_64 + - QTDIR: C:\5.12.4\mingw73_32 + - QTDIR: C:\5.12.4\msvc2017 + - QTDIR: C:\5.12.4\msvc2017_64 + - QTDIR: C:\5.12.4\mingw73_64 + - QTDIR: C:\5.12.4\mingw73_32 + - QTDIR: C:\5.12.4\msvc2015_64 + - QTDIR: C:\5.12.3\mingw73_64 + - QTDIR: C:\5.12.3\mingw73_32 + - QTDIR: C:\5.12.3\msvc2017 + - QTDIR: C:\5.12.3\msvc2017_64 + - QTDIR: C:\5.11.3\mingw53_32 + - QTDIR: C:\5.11.3\msvc2015 + - QTDIR: C:\5.10.1\msvc2017_64 + - QTDIR: C:\5.10.1\winrt_armv7_msvc2017 + - QTDIR: C:\5.10.1\winrt_x86_msvc2017 + - QTDIR: C:\5.10.1\winrt_x64_msvc2017 + - QTDIR: C:\5.9.7\msvc2017_64 + - QTDIR: C:\5.9.7\winrt_armv7_msvc2017 + - QTDIR: C:\5.9.7\winrt_x86_msvc2017 + - QTDIR: C:\5.9.7\winrt_x64_msvc2017 configuration: - debug From 1f19423668ab7e42387afe37b61bf24d3da43a62 Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 19:54:19 +0430 Subject: [PATCH 5/6] Update appveyor.yml From 6bfb8da8690aaabe1ffe45a4511336ad8e595b6b Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Mon, 5 Aug 2019 09:26:19 +0430 Subject: [PATCH 6/6] fix: appveyor Qt path --- appveyor.yml | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0c68e0d..8d29458 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,34 +2,22 @@ version: '{branch}-{build}' environment: matrix: - - QTDIR: C:\5.13.0\mingw73_64 - - QTDIR: C:\5.13.0\mingw73_32 - - QTDIR: C:\5.13.0\msvc2017 - - QTDIR: C:\5.13.0\msvc2017_64 - - QTDIR: C:\5.13.0\mingw73_64 - - QTDIR: C:\5.13.0\mingw73_32 - - QTDIR: C:\5.13.0\msvc2015_64 - - QTDIR: C:\5.12.4\mingw73_64 - - QTDIR: C:\5.12.4\mingw73_32 - - QTDIR: C:\5.12.4\msvc2017 - - QTDIR: C:\5.12.4\msvc2017_64 - - QTDIR: C:\5.12.4\mingw73_64 - - QTDIR: C:\5.12.4\mingw73_32 - - QTDIR: C:\5.12.4\msvc2015_64 - - QTDIR: C:\5.12.3\mingw73_64 - - QTDIR: C:\5.12.3\mingw73_32 - - QTDIR: C:\5.12.3\msvc2017 - - QTDIR: C:\5.12.3\msvc2017_64 - - QTDIR: C:\5.11.3\mingw53_32 - - QTDIR: C:\5.11.3\msvc2015 - - QTDIR: C:\5.10.1\msvc2017_64 - - QTDIR: C:\5.10.1\winrt_armv7_msvc2017 - - QTDIR: C:\5.10.1\winrt_x86_msvc2017 - - QTDIR: C:\5.10.1\winrt_x64_msvc2017 - - QTDIR: C:\5.9.7\msvc2017_64 - - QTDIR: C:\5.9.7\winrt_armv7_msvc2017 - - QTDIR: C:\5.9.7\winrt_x86_msvc2017 - - QTDIR: C:\5.9.7\winrt_x64_msvc2017 + - QTDIR: C:\Qt\5.13.0\mingw73_64 + - QTDIR: C:\Qt\5.13.0\mingw73_32 + - QTDIR: C:\Qt\5.13.0\msvc2015_64 + - QTDIR: C:\Qt\5.13.0\msvc2017 + - QTDIR: C:\Qt\5.13.0\msvc2017_64 + - QTDIR: C:\Qt\5.11.3\mingw53_32 + - QTDIR: C:\Qt\5.10.1\msvc2017_64 + - QTDIR: C:\Qt\5.10.1\winrt_armv7_msvc2017 + - QTDIR: C:\Qt\5.10.1\winrt_x86_msvc2017 + - QTDIR: C:\Qt\5.10.1\winrt_x64_msvc2017 + - QTDIR: C:\Qt\5.9.7\msvc2017_64 + - QTDIR: C:\Qt\5.9.7\winrt_armv7_msvc2017 + - QTDIR: C:\Qt\5.9.7\winrt_x86_msvc2017 + - QTDIR: C:\Qt\5.9.7\winrt_x64_msvc2017 + - QTDIR: C:\Qt\5.7.0\mingw53_32 + - QTDIR: C:\Qt\5.7.0\msvc2015 configuration: - debug