bachase
diff --git a/‎.circleci/config.yml
+59 b/‎.circleci/config.yml
+59
diff --git a/‎.editorconfig
+32 b/‎.editorconfig
+32
diff --git a/‎.gitattributes
+8 b/‎.gitattributes
+8
diff --git a/‎.gitignore
+9-4 b/‎.gitignore
+9-4
diff --git a/‎.markdownlint.json
+7 b/‎.markdownlint.json
+7
diff --git a/‎.travis.yml
+37-22 b/‎.travis.yml
+37-22
@@ -0,0 +1,59 @@
+version: 2
+jobs:
+  lint:
+    docker:
+      - image: circleci/ruby:2.4.1-node
+    steps:
+      - checkout
+      - run:
+          name: install markdownlint
+          command: |
+            sudo npm install -g markdownlint-cli
+            markdownlint --version
+      - run:
+          name: lint README.md
+          command: markdownlint --config .markdownlint.json README.md
+      - run:
+          name: lint docs/
+          command: markdownlint --config .markdownlint.json docs/
+  build-deploy:
+    docker:
+      - image: circleci/python:2.7
+    steps:
+      - checkout
+      - run:
+          name: install mkdocs
+          command: sudo pip install mkdocs
+      - run:
+          name: generate docs
+          command: mkdocs build --clean
+      - run:
+          name: install lftp
+          command: |
+            sudo apt-get update -q
+            sudo apt-get install -y lftp
+      - run:
+          name: deploy docs
+          command: lftp sftp://${DEPLOY_DOCS_USER}:${DEPLOY_DOCS_PASS}@${DEPLOY_DOCS_HOST} -e "set ftp:ssl-force true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; set sftp:auto-confirm yes; mirror -v -R ./site ${DEPLOY_DOCS_BASE}/doc/${CIRCLE_BRANCH}; quit"
+
+workflows:
+  version: 2
+  docs-workflow:
+    jobs:
+      - lint:
+          filters:
+            branches:
+              only:
+                - master
+                - /release*/
+      - build-deploy:
+          requires:
+            - lint
+          filters:
+            branches:
+              only:
+                - master
+                - /release*/
+notify:
+  webhooks:
+    - url: https://webhooks.gitter.im/e/9ff4be3a6f08f55106e2
@@ -0,0 +1,32 @@
+# This is the EditorConfig (http://editorconfig.org/) coding style file for SOCI.
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+# 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}]
+end_of_line = crlf
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+trim_trailing_whitespace = true
@@ -1,6 +1,14 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 
+*.bash eol=lf
+*.env eol=lf
+*.sh eol=lf
+*.cmd eol=crlf
+*.bat eol=crlf
+*.BAT eol=crlf
+*.CMD eol=crlf
+
 # Custom for Visual Studio
 *.cs     diff=csharp
 *.sln    merge=union
 
@@ -5,24 +5,26 @@ tags
 tmp
 
 # Build directories
-_build*
-src/_build*
-src/build
+/*build*
+/*site*
 
 # Files generated by CMake
 Makefile
 src/core/soci_backends_config.h
+tests/odbc/test-access.dsn
+tests/odbc/test-mysql.dsn
 
 # ... and the rest of CMake spam
 CMakeFiles/
 CMakeCache.txt
 CTestTestfile.cmake
 cmake_install.cmake
 
-# Visual Studio
+# Visual Studio / Visual Studio Code
 *.opensdf
 *.sdf
 *.suo
+/*.vs*
 
 # KDevelop
 *.kate-swp
@@ -37,3 +39,6 @@ CMakeLists.txt.user
 
 # Eclipse
 /.project
+
+# Vagrant
+/.vagrant/
@@ -0,0 +1,7 @@
+{
+    "default": true,
+    "MD013": false,
+    "MD026": false,
+    "MD024": false,
+    "MD029": {"style": "ordered"}
+}
@@ -3,8 +3,12 @@
 #
 # Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
 #
+# TODO: Switch to Trusty https://github.com/SOCI/soci/issues/574
+dist: precise
 language: cpp
 
+sudo: required
+
 compiler:
   - g++
   #- clang
@@ -14,32 +18,43 @@ services:
   - postgresql
 
 env:
-  - SOCI_TRAVIS_BACKEND=db2
-  - SOCI_TRAVIS_BACKEND=empty
-  - SOCI_TRAVIS_BACKEND=firebird
-  - SOCI_TRAVIS_BACKEND=mysql
-  - SOCI_TRAVIS_BACKEND=odbc
-  - SOCI_TRAVIS_BACKEND=oracle CFLAGS=-m32 CXXFLAGS=-m32 WITH_BOOST=OFF
-  - SOCI_TRAVIS_BACKEND=postgresql
-  - SOCI_TRAVIS_BACKEND=postgression
-  - SOCI_TRAVIS_BACKEND=sqlite3
+  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
 
-matrix:
-  fast_finish: true
-  allow_failures:
-    - env: SOCI_TRAVIS_BACKEND=postgression
+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
 
-before_install: ./bin/ci/before_install.sh
-before_script: ./bin/ci/before_script.sh
-script: ./bin/ci/script.sh
+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
-
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/000781732a3b1637ef82
+    on_start: always
   irc:
     channels:
       - "irc.freenode.org#soci"