From 651493446ae984e16544b1c9976eb569feb0c398 Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 14 Jul 2019 17:26:32 +0430 Subject: [PATCH 01/10] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 14029db..9823e1d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ install: - - set QTDIR=C:\Qt\5.9.2\winrt_x64_msvc2017 - - set PATH=%PATH%;%QTDIR%\bin;C:\MinGW\bin + - set QTDIR=C:\Qt\5.12.2\msvc2017_64 + - set PATH=%PATH%;%QTDIR%\bin;C:\Qt\Tools\mingw530_32 build_script: - qmake - mingw32-make From c8a7479a9fd18dbac1450ee861a0aa95705e2c9d Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 11:28:08 +0430 Subject: [PATCH 02/10] Update .travis.yml Remove extra quotation mark --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d7bb32e..33819c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ before_script: - '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" == */opt-* ]] || export QT_SELECT=qt5' - mkdir -p "$TRAVIS_BUILD_DIR-build" - cd "$TRAVIS_BUILD_DIR-build" - - echo 'QT -= gui' >> ""$TRAVIS_BUILD_DIR/ci-test-init.pri" + - echo 'QT -= gui' >> "$TRAVIS_BUILD_DIR/ci-test-init.pri" - qmake -r -Wall -Wlogic -Wparser CONFIG+=debug_and_release "$TRAVIS_BUILD_DIR/nut.pro" script: From 69e695a81e3ca395745ba697b95342a8be9be09c Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 18:16:15 +0430 Subject: [PATCH 03/10] Update appveyor.yml --- appveyor.yml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9823e1d..e178a5c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,55 @@ +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 + install: - - set QTDIR=C:\Qt\5.12.2\msvc2017_64 - - set PATH=%PATH%;%QTDIR%\bin;C:\Qt\Tools\mingw530_32 + - appveyor-retry choco install doxygen.portable + - appveyor-retry choco install graphviz.portable + # Setup the build toolchains. + - '%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' >> "$TRAVIS_BUILD_DIR/ci-test-init.pri" + - '%make%' + +test_script: + # @todo output using Qt's -xunitxml option + - if not %CONFIGURATION%==debug %make% check TESTARGS=-silent From 8f772818fb98cbb8b11b5d6192e00e716bb45b9f Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 18:18:08 +0430 Subject: [PATCH 04/10] Update appveyor.yml --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e178a5c..e95ccfe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,9 +26,6 @@ configuration: - release install: - - appveyor-retry choco install doxygen.portable - - appveyor-retry choco install graphviz.portable - # Setup the build toolchains. - '%QTDIR%\bin\qtenv2.bat' - qmake -v - if %QTDIR:_64=%==%QTDIR% ( set ARCH=x86 ) else set ARCH=x64 From 0b6815bf58468428615709139e5a8b98fc82cb9e Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 18:20:31 +0430 Subject: [PATCH 05/10] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e95ccfe..58f7462 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -44,7 +44,7 @@ before_build: build_script: - cd %APPVEYOR_BUILD_FOLDER%-build - - echo 'QT -= gui' >> "$TRAVIS_BUILD_DIR/ci-test-init.pri" + - echo 'QT -= gui' >> %APPVEYOR_BUILD_FOLDER%\ci-test-init.pri - '%make%' test_script: From 5dc5d89648aec017e2a313bbc484f1b88a00965b Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 18:35:08 +0430 Subject: [PATCH 06/10] Update appveyor.yml --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 58f7462..81203dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,6 +25,10 @@ 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: - '%QTDIR%\bin\qtenv2.bat' - qmake -v From 2a1df6895d5c06dd21e9ba8c81b979945312f4bc Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 18:39:02 +0430 Subject: [PATCH 07/10] Update README.md --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 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 From ea6c0fec14e0e3fccf447efd7b14ce72794b45d4 Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 18:48:06 +0430 Subject: [PATCH 08/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 61ab559..b92e896 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/api/projects/status/HamedMasafi/nut?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) From 4a6b3a05dac42d32dcf157b7b6e13b41d654cbca Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 19:41:15 +0430 Subject: [PATCH 09/10] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 81203dc..aa4aa69 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,8 @@ clone_script: - cmd: git checkout -qf %APPVEYOR_REPO_COMMIT% install: - - '%QTDIR%\bin\qtenv2.bat' + - %QTDIR%\bin\qtenv2.bat + - set PATH=%PATH%;%QTDIR%\bin - qmake -v - if %QTDIR:_64=%==%QTDIR% ( set ARCH=x86 ) else set ARCH=x64 - if %QTDIR:msvc=%==%QTDIR% g++ --version From e29c6cdc73eaf8c677ed006c3717991a946ee123 Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 4 Aug 2019 19:43:08 +0430 Subject: [PATCH 10/10] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index aa4aa69..2c50d19 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ clone_script: - cmd: git checkout -qf %APPVEYOR_REPO_COMMIT% install: - - %QTDIR%\bin\qtenv2.bat +# - '%QTDIR%\bin\qtenv2.bat' - set PATH=%PATH%;%QTDIR%\bin - qmake -v - if %QTDIR:_64=%==%QTDIR% ( set ARCH=x86 ) else set ARCH=x64