-
-
Notifications
You must be signed in to change notification settings - Fork 316
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #910 from fnc12/dev
1.8
- Loading branch information
Showing
279 changed files
with
24,797 additions
and
15,927 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,161 @@ | ||
| # build format | ||
| version: "{build}" | ||
|
|
||
| skip_branch_with_pr: true | ||
| skip_commits: | ||
| files: | ||
| - .git* | ||
| - .travis.yml | ||
| - _config.yml | ||
| - LICENSE | ||
| - '*.md' | ||
| - '*.png' | ||
| - '*.sh' | ||
|
|
||
| image: | ||
| - Visual Studio 2017 | ||
|
|
||
| # configurations to add to build matrix | ||
| # TODO: MinGW Makefiles and MSYS Makefiles | ||
| configuration: | ||
| - Debug | ||
| - Release | ||
|
|
||
| platform: | ||
| - x86 | ||
| - x64 | ||
|
|
||
| environment: | ||
| matrix: | ||
| # using c++14 | ||
| - SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_14=ON" | ||
|
|
||
| # using C++17 (for std::optional support) | ||
| - SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON" | ||
|
|
||
| init: | ||
| - echo %APPVEYOR_BUILD_WORKER_IMAGE% - %configuration% - %PLATFORM% | ||
| - if "%PLATFORM%"=="x64" (set architecture=-A x64) | ||
| - if "%PLATFORM%"=="x86" (set architecture=-A Win32) | ||
| - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (set generator="Visual Studio 16 2019" %architecture%) | ||
| - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (set generator="Visual Studio 15 2017" %architecture%) | ||
| - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (set generator="Visual Studio 14 2015" %architecture%) | ||
| - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" (set generator="Visual Studio 12 2013" %architecture%) | ||
|
|
||
| install: | ||
| - C:\Tools\vcpkg\vcpkg integrate install | ||
| - vcpkg install sqlite3:%PLATFORM%-windows | ||
|
|
||
| # scripts to run before build | ||
| before_build: | ||
| - mkdir compile | ||
| - cd compile | ||
| - cmake %SQLITE_ORM_CXX_STANDARD% -DSqliteOrm_BuildTests=ON .. -G %generator% -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake | ||
|
|
||
| # build examples, and run tests (ie make & make test) | ||
| build_script: | ||
| - cmake --build . --config %configuration% | ||
| - ctest --verbose --output-on-failure --build-config %configuration% | ||
| # build format | ||
| version: "{build}" | ||
|
|
||
| skip_branch_with_pr: true | ||
| skip_commits: | ||
| files: | ||
| - .git* | ||
| - .travis.yml | ||
| - _config.yml | ||
| - LICENSE | ||
| - '*.md' | ||
| - '*.png' | ||
| - '*.sh' | ||
|
|
||
| # configurations to add to build matrix | ||
| configuration: | ||
| #- Debug | ||
| - Release | ||
|
|
||
| environment: | ||
| appveyor_yml_disable_ps_linux: true | ||
| matrix: | ||
| - job_name: clang, C++14 | ||
| appveyor_build_worker_image: Ubuntu | ||
| CC: clang | ||
| CXX: clang++ | ||
| SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_14=ON" | ||
|
|
||
| - job_name: gcc, C++14 | ||
| appveyor_build_worker_image: Ubuntu | ||
| CC: gcc | ||
| CXX: g++ | ||
| SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_14=ON" | ||
|
|
||
| # Representative for C++14 | ||
| - job_name: Visual Studio 2015 Update 3, x64, C++14 | ||
| appveyor_build_worker_image: Visual Studio 2015 | ||
| platform: x64 | ||
| SQLITE_ORM_CXX_STANDARD: "" | ||
|
|
||
| - job_name: clang, C++17 | ||
| appveyor_build_worker_image: Ubuntu | ||
| CC: clang | ||
| CXX: clang++ | ||
| SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON" | ||
|
|
||
| - job_name: clang, C++20 | ||
| appveyor_build_worker_image: Ubuntu | ||
| CC: clang | ||
| CXX: clang++ | ||
| SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_20=ON" | ||
|
|
||
| - job_name: gcc, C++17 | ||
| appveyor_build_worker_image: Ubuntu | ||
| CC: gcc | ||
| CXX: g++ | ||
| SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON" | ||
|
|
||
| - job_name: gcc, C++20 | ||
| appveyor_build_worker_image: Ubuntu | ||
| CC: gcc | ||
| CXX: g++ | ||
| SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_20=ON" | ||
|
|
||
| - job_name: Visual Studio 2022, x64, C++17 | ||
| appveyor_build_worker_image: Visual Studio 2022 | ||
| platform: x64 | ||
| SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON" | ||
|
|
||
| - job_name: Visual Studio 2022, x64, C++20 | ||
| appveyor_build_worker_image: Visual Studio 2022 | ||
| platform: x64 | ||
| SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_20=ON" | ||
|
|
||
| - job_name: Visual Studio 2022, x86, C++20 | ||
| appveyor_build_worker_image: Visual Studio 2022 | ||
| platform: x86 | ||
| SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_20=ON" | ||
|
|
||
| matrix: | ||
| fast_finish: true | ||
|
|
||
| for: | ||
| - | ||
| # Windows | ||
| matrix: | ||
| only: | ||
| - appveyor_build_worker_image: Visual Studio 2015 | ||
| - appveyor_build_worker_image: Visual Studio 2022 | ||
| init: | ||
| - |- | ||
| echo %appveyor_build_worker_image% - %platform% - %configuration% | ||
| if "%platform%"=="x64" (set architecture=-A x64) | ||
| if "%platform%"=="x86" (set architecture=-A Win32) | ||
| if "%appveyor_build_worker_image%"=="Visual Studio 2022" (set generator="Visual Studio 17 2022" %architecture%) | ||
| if "%appveyor_build_worker_image%"=="Visual Studio 2015" (set generator="Visual Studio 14 2015" %architecture%) | ||
| install: | ||
| - |- | ||
| C:\Tools\vcpkg\vcpkg integrate install | ||
| vcpkg install sqlite3:%platform%-windows | ||
| before_build: | ||
| - |- | ||
| mkdir compile | ||
| cd compile | ||
| cmake %SQLITE_ORM_CXX_STANDARD% -DSqliteOrm_BuildTests=ON .. -G %generator% -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake | ||
| # build examples, and run tests (ie make & make test) | ||
| build_script: | ||
| - |- | ||
| cmake --build . --config %configuration% | ||
| ctest --verbose --output-on-failure --build-config %configuration% | ||
| - | ||
| # Linux | ||
| matrix: | ||
| only: | ||
| - appveyor_build_worker_image: Ubuntu | ||
| init: | ||
| - |- | ||
| echo $appveyor_build_worker_image | ||
| $CXX --version | ||
| # using custom vcpkg triplets for building and linking dynamic dependent libraries | ||
| install: | ||
| - |- | ||
| $HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets | ||
| vcpkg install sqlite3 --overlay-triplets=vcpkg/triplets | ||
| before_build: | ||
| - |- | ||
| mkdir compile | ||
| cd compile | ||
| cmake $SQLITE_ORM_CXX_STANDARD -DSqliteOrm_BuildTests=ON .. -DCMAKE_TOOLCHAIN_FILE=$HOME/vcpkg/scripts/buildsystems/vcpkg.cmake | ||
| # build examples, and run tests (ie make & make test) | ||
| build_script: | ||
| - |- | ||
| cmake --build . | ||
| ctest --verbose --output-on-failure | ||
| - | ||
| # macOS | ||
| matrix: | ||
| only: | ||
| - appveyor_build_worker_image: macOS | ||
| init: | ||
| - |- | ||
| echo $appveyor_build_worker_image | ||
| $CXX --version | ||
| # using custom vcpkg triplets for building and linking dynamic dependent libraries | ||
| install: | ||
| - |- | ||
| git clone --depth 1 --branch 2022.05.10 https://github.com/microsoft/vcpkg.git $HOME/vcpkg | ||
| $HOME/vcpkg/booststrap.sh | ||
| $HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets | ||
| vcpkg install sqlite3 --overlay-triplets=vcpkg/triplets | ||
| before_build: | ||
| - |- | ||
| mkdir compile | ||
| cd compile | ||
| cmake $SQLITE_ORM_CXX_STANDARD -DSqliteOrm_BuildTests=ON .. -DCMAKE_TOOLCHAIN_FILE=$HOME/vcpkg/scripts/buildsystems/vcpkg.cmake | ||
| # build examples, and run tests (ie make & make test) | ||
| build_script: | ||
| - |- | ||
| cmake --build . | ||
| ctest --verbose --output-on-failure |
Oops, something went wrong.