Commit 3fa0a58c authored by Mateusz Loskot's avatar Mateusz Loskot

[EditorConfig] Add settings for YAML and CMake scripts

Re-indent .yml files to use 2 spaces
parent b36f437b
......@@ -9,8 +9,19 @@ indent_style = space
indent_size = 4
trim_trailing_whitespace = true
[{Vagrantfile,CMakeLists.txt,*.cmake}]
# CMake configuration files
[{CMakeLists.txt,*.cmake}]
indent_size = 2
indent_style = space
trim_trailing_whitespace = true
insert_final_newline = true
# CI configuration files
[{.travis.yml,appveyor.yml,Vagrantfile}]
indent_size = 2
indent_style = space
trim_trailing_whitespace = true
insert_final_newline = true
# Windows shell scripts
[*.{cmd,bat,ps1}]
......
......@@ -10,58 +10,58 @@ language: cpp
sudo: required
compiler:
- g++
- clang
- g++
- clang
services:
- mysql
- postgresql
- mysql
- postgresql
env:
global:
- secure: "I7/28jg7R24y64426d5XsfILrd/VW0BdwFbNpEgBfW1qNk9GpkNGTvp/ET6hKwBVrW5jmN9QdEviGcPpQRIAlMj6g9GvZeAUxM+VZTcXD2u30REUPPxNTJMRVHPfL9DA7EMFCST8SjBCgMdTHFwqLV4vSQEF4NTXbntley/IPfM="
matrix:
- SOCI_TRAVIS_BACKEND=db2
- SOCI_TRAVIS_BACKEND=empty
- SOCI_TRAVIS_BACKEND=firebird
- SOCI_TRAVIS_BACKEND=mysql
- SOCI_TRAVIS_BACKEND=odbc
- SOCI_TRAVIS_BACKEND=postgresql
- SOCI_TRAVIS_BACKEND=sqlite3
- SOCI_TRAVIS_BACKEND=valgrind
- SOCI_TRAVIS_BACKEND=oracle WITH_BOOST=OFF
global:
- secure: "I7/28jg7R24y64426d5XsfILrd/VW0BdwFbNpEgBfW1qNk9GpkNGTvp/ET6hKwBVrW5jmN9QdEviGcPpQRIAlMj6g9GvZeAUxM+VZTcXD2u30REUPPxNTJMRVHPfL9DA7EMFCST8SjBCgMdTHFwqLV4vSQEF4NTXbntley/IPfM="
matrix:
- SOCI_TRAVIS_BACKEND=db2
- SOCI_TRAVIS_BACKEND=empty
- SOCI_TRAVIS_BACKEND=firebird
- SOCI_TRAVIS_BACKEND=mysql
- SOCI_TRAVIS_BACKEND=odbc
- SOCI_TRAVIS_BACKEND=postgresql
- SOCI_TRAVIS_BACKEND=sqlite3
- SOCI_TRAVIS_BACKEND=valgrind
- SOCI_TRAVIS_BACKEND=oracle WITH_BOOST=OFF
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- kalakris-cmake
packages:
- cmake
coverity_scan:
project:
name: "SOCI/soci"
notification_email: soci-devel@lists.sourceforge.net
build_command_prepend: "mkdir build.cov; cd build.cov; cmake .."
build_command: "make -j 4"
branch_pattern: coverity_scan
apt:
sources:
- ubuntu-toolchain-r-test
- kalakris-cmake
packages:
- cmake
coverity_scan:
project:
name: "SOCI/soci"
notification_email: soci-devel@lists.sourceforge.net
build_command_prepend: "mkdir build.cov; cd build.cov; cmake .."
build_command: "make -j 4"
branch_pattern: coverity_scan
before_install: ./scripts/travis/before_install.sh
before_script: ./scripts/travis/before_script.sh
script: ./scripts/travis/script.sh
notifications:
#email:
# recipients:
# - soci-devel@lists.sourceforge.net
# on_success: change # [always|never|change] # default: change
# on_failure: always # [always|never|change] # default: always
irc:
channels:
- "irc.freenode.org#soci"
webhooks:
urls:
- https://webhooks.gitter.im/e/379a56f450b22684c051 # SOCI unique webhook url for this service
on_success: always # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: always # options: [always|never|change] default: always
#email:
# recipients:
# - soci-devel@lists.sourceforge.net
# on_success: change # [always|never|change] # default: change
# on_failure: always # [always|never|change] # default: always
irc:
channels:
- "irc.freenode.org#soci"
webhooks:
urls:
- https://webhooks.gitter.im/e/379a56f450b22684c051 # SOCI unique webhook url for this service
on_success: always # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: always # options: [always|never|change] default: always
version: 4.0.0.{build}
environment:
MINGW_ARCHIVE: C:\projects\mingw\x86_64-4.8.3-release-posix-seh-rt_v3-rev2.7z
MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.8.3/threads-posix/seh/x86_64-4.8.3-release-posix-seh-rt_v3-rev2.7z/download
matrix:
- PRJ_GEN: "Visual Studio 11 2012 Win64"
BDIR: msvc2012
PRJ_CFG: Release
BOOST_ROOT: C:\Libraries\boost_1_58_0
POSTGRESQL_ROOT: C:\Program Files\PostgreSQL\9.4
MYSQL_DIR: C:\Program Files\MySql\MySQL Server 5.7
- PRJ_GEN: "Visual Studio 12 2013 Win64"
BDIR: msvc2013
PRJ_CFG: Release
BOOST_ROOT: C:\Libraries\boost_1_58_0
POSTGRESQL_ROOT: C:\Program Files\PostgreSQL\9.4
MYSQL_DIR: C:\Program Files\MySql\MySQL Server 5.7
- PRJ_GEN: "Visual Studio 14 2015 Win64"
BDIR: msvc2015
PRJ_CFG: Release
BOOST_ROOT: C:\Libraries\boost_1_59_0
POSTGRESQL_ROOT: C:\Program Files\PostgreSQL\9.4
MYSQL_DIR: C:\Program Files\MySql\MySQL Server 5.7
- PRJ_GEN: "MinGW Makefiles"
BDIR: gcc483
PRJ_CFG: Release
MINGW_ROOT: C:\projects\mingw\4.8.3\mingw64\bin
BOOST_ROOT: C:\Libraries\boost_1_59_0
POSTGRESQL_ROOT: C:\Program Files\PostgreSQL\9.4
MYSQL_DIR: C:\Program Files\MySql\MySQL Server 5.7
MINGW_ARCHIVE: C:\projects\mingw\x86_64-4.8.3-release-posix-seh-rt_v3-rev2.7z
MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.8.3/threads-posix/seh/x86_64-4.8.3-release-posix-seh-rt_v3-rev2.7z/download
matrix:
- PRJ_GEN: "Visual Studio 11 2012 Win64"
BDIR: msvc2012
PRJ_CFG: Release
BOOST_ROOT: C:\Libraries\boost_1_58_0
POSTGRESQL_ROOT: C:\Program Files\PostgreSQL\9.4
MYSQL_DIR: C:\Program Files\MySql\MySQL Server 5.7
- PRJ_GEN: "Visual Studio 12 2013 Win64"
BDIR: msvc2013
PRJ_CFG: Release
BOOST_ROOT: C:\Libraries\boost_1_58_0
POSTGRESQL_ROOT: C:\Program Files\PostgreSQL\9.4
MYSQL_DIR: C:\Program Files\MySql\MySQL Server 5.7
- PRJ_GEN: "Visual Studio 14 2015 Win64"
BDIR: msvc2015
PRJ_CFG: Release
BOOST_ROOT: C:\Libraries\boost_1_59_0
POSTGRESQL_ROOT: C:\Program Files\PostgreSQL\9.4
MYSQL_DIR: C:\Program Files\MySql\MySQL Server 5.7
- PRJ_GEN: "MinGW Makefiles"
BDIR: gcc483
PRJ_CFG: Release
MINGW_ROOT: C:\projects\mingw\4.8.3\mingw64\bin
BOOST_ROOT: C:\Libraries\boost_1_59_0
POSTGRESQL_ROOT: C:\Program Files\PostgreSQL\9.4
MYSQL_DIR: C:\Program Files\MySql\MySQL Server 5.7
services:
- mssql2014
- mysql
- postgresql
- mssql2014
- mysql
- postgresql
cache:
- C:\projects\mingw
- C:\projects\mingw
install:
- ps: |
if ($env:PRJ_GEN -eq "MinGW Makefiles")
{
if (!(Test-Path C:\projects\mingw))
{
mkdir C:\projects\mingw
}
if (!(Test-Path $env:MINGW_ARCHIVE))
{
(new-object net.webclient).DownloadFile("$env:MINGW_URL", "$env:MINGW_ARCHIVE")
7z x -y -oC:\projects\mingw\4.8.3\ $env:MINGW_ARCHIVE > $null
}
}
Import-Module C:\projects\soci\scripts\windows\Get-ODBCList.ps1
Get-ODBCList
- git clone https://github.com/snikulov/sqlite.cmake.build.git C:\projects\sqlite\src
- ps: |
if ($env:PRJ_GEN -eq "MinGW Makefiles")
{
if (!(Test-Path C:\projects\mingw))
{
mkdir C:\projects\mingw
}
if (!(Test-Path $env:MINGW_ARCHIVE))
{
(new-object net.webclient).DownloadFile("$env:MINGW_URL", "$env:MINGW_ARCHIVE")
7z x -y -oC:\projects\mingw\4.8.3\ $env:MINGW_ARCHIVE > $null
}
}
Import-Module C:\projects\soci\scripts\windows\Get-ODBCList.ps1
Get-ODBCList
- git clone https://github.com/snikulov/sqlite.cmake.build.git C:\projects\sqlite\src
before_build:
# dirty little hack - remove sh from Git to make generator happy
- ps: |
if ($env:PRJ_GEN -eq "MinGW Makefiles")
# dirty little hack - remove sh from Git to make generator happy
- ps: |
if ($env:PRJ_GEN -eq "MinGW Makefiles")
{
$shellPath = (Get-Command sh.exe).definition
if ($shellPath)
{
if (Test-Path $shellPath)
{
$shellPath = (Get-Command sh.exe).definition
if ($shellPath)
{
if (Test-Path $shellPath)
{
Remove-Item $shellPath
}
}
Remove-Item $shellPath
}
- cd C:\projects\sqlite\src
- mkdir build.%BDIR%
- cd build.%BDIR%
- set SQLITE_ROOT=C:\projects\sqlite\sqlite.%BDIR%
- set PATH=%MINGW_ROOT%;%PATH%;%SQLITE_ROOT%\bin;%POSTGRESQL_ROOT%\bin;%MYSQL_DIR%\bin;%MYSQL_DIR%\lib
- echo %PATH%
- cmake --version
- set PGUSER=postgres
- set PGPASSWORD=Password12!
- createdb soci_test
- set MYSQL_PWD=Password12!
- set USER=root
- mysql -e "create database soci_test;" --user=root
- sqlcmd -U sa -P Password12! -S (local)\SQL2014 -i C:\projects\soci\scripts\windows\mssql_db_create.sql
- cmake .. -G"%PRJ_GEN%" -DCMAKE_BUILD_TYPE=%PRJ_CFG% -DCMAKE_INSTALL_PREFIX=C:\projects\sqlite\sqlite.%BDIR%
- cmake --build . --config %PRJ_CFG% --target install
}
}
- cd C:\projects\sqlite\src
- mkdir build.%BDIR%
- cd build.%BDIR%
- set SQLITE_ROOT=C:\projects\sqlite\sqlite.%BDIR%
- set PATH=%MINGW_ROOT%;%PATH%;%SQLITE_ROOT%\bin;%POSTGRESQL_ROOT%\bin;%MYSQL_DIR%\bin;%MYSQL_DIR%\lib
- echo %PATH%
- cmake --version
- set PGUSER=postgres
- set PGPASSWORD=Password12!
- createdb soci_test
- set MYSQL_PWD=Password12!
- set USER=root
- mysql -e "create database soci_test;" --user=root
- sqlcmd -U sa -P Password12! -S (local)\SQL2014 -i C:\projects\soci\scripts\windows\mssql_db_create.sql
- cmake .. -G"%PRJ_GEN%" -DCMAKE_BUILD_TYPE=%PRJ_CFG% -DCMAKE_INSTALL_PREFIX=C:\projects\sqlite\sqlite.%BDIR%
- cmake --build . --config %PRJ_CFG% --target install
build_script:
- cd C:\projects\soci
- mkdir build.%BDIR%
- cd build.%BDIR%
- cmake .. -G"%PRJ_GEN%" -DCMAKE_BUILD_TYPE=%PRJ_CFG% -DCMAKE_VERBOSE_MAKEFILE=ON
- cmake --build . --config %PRJ_CFG% --clean-first
- cd C:\projects\soci
- mkdir build.%BDIR%
- cd build.%BDIR%
- cmake .. -G"%PRJ_GEN%" -DCMAKE_BUILD_TYPE=%PRJ_CFG% -DCMAKE_VERBOSE_MAKEFILE=ON
- cmake --build . --config %PRJ_CFG% --clean-first
test_script:
- ctest -V --output-on-failure -R "soci_empty|soci_postgresql|soci_sqlite3|soci_odbc_test_mssql|soci_mysql|soci_odbc_test_mysql|soci_odbc_test_postgresql"
- ctest -V --output-on-failure -R "soci_empty|soci_postgresql|soci_sqlite3|soci_odbc_test_mssql|soci_mysql|soci_odbc_test_mysql|soci_odbc_test_postgresql"
notifications:
- provider: Webhook
url: https://webhooks.gitter.im/e/ff1ff4818e9d3a166786
on_build_success: true
on_build_failure: true
on_build_status_changed: true
- provider: Webhook
url: https://webhooks.gitter.im/e/ff1ff4818e9d3a166786
on_build_success: true
on_build_failure: true
on_build_status_changed: true
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment