From 9cc14c98e1142a5c803ec1665f28f395cad07e92 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 18 Dec 2016 09:26:27 -0500 Subject: [PATCH 1/6] More CI is better CI. Try TravisCI. --- .travis.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..b957cb88 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,21 @@ +sudo: required +cache: bundler +services: + - docker +rvm: + - 2.1.9 + - 2.2.5 + - 2.3.1 +before_install: + - docker info + - sudo ./test/bin/setup.sh + - sudo ./test/bin/install-openssl.sh + - openssl version + - sudo ./test/bin/install-freetds.sh + - tsql -C +install: + - gem install bundler + - bundle --version + - bundle install +script: + - bundle exec rake From fb70890324968257fc8a7c0ed757137ed9217237 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 18 Dec 2016 10:00:02 -0500 Subject: [PATCH 2/6] Add /opt/local/bin to $PATH. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index b957cb88..c123fe34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ rvm: - 2.2.5 - 2.3.1 before_install: + - export PATH=/opt/local/bin:$PATH - docker info - sudo ./test/bin/setup.sh - sudo ./test/bin/install-openssl.sh @@ -14,6 +15,7 @@ before_install: - sudo ./test/bin/install-freetds.sh - tsql -C install: + - export PATH=/opt/local/bin:$PATH - gem install bundler - bundle --version - bundle install From 46435f4d57a065388d4add414306830b0488d0ff Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 18 Dec 2016 10:26:14 -0500 Subject: [PATCH 3/6] Clean up OpenSSL & FreeTDS install file/dir. --- test/bin/install-freetds.sh | 3 +++ test/bin/install-openssl.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/test/bin/install-freetds.sh b/test/bin/install-freetds.sh index 1b978167..526f8d9d 100755 --- a/test/bin/install-freetds.sh +++ b/test/bin/install-freetds.sh @@ -15,3 +15,6 @@ cd freetds-$FREETDS_VERSION --with-tdsver=7.3 make make install +cd .. +rm -rf freetds-$FREETDS_VERSION +rm freetds-$FREETDS_VERSION.tar.gz diff --git a/test/bin/install-openssl.sh b/test/bin/install-openssl.sh index f9b4a627..8fd11282 100755 --- a/test/bin/install-openssl.sh +++ b/test/bin/install-openssl.sh @@ -13,3 +13,6 @@ cd openssl-$OPENSSL_VERSION ./config --prefix=/opt/local make make install +cd .. +rm -rf openssl-$OPENSSL_VERSION +rm openssl-$OPENSSL_VERSION.tar.gz From 3f6ea3f1f4bca70e9db17ddd3d9ccacf7e251507 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 18 Dec 2016 10:45:32 -0500 Subject: [PATCH 4/6] Debug docker install/run script. --- test/bin/setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/bin/setup.sh b/test/bin/setup.sh index 56bba14a..10ab6e50 100755 --- a/test/bin/setup.sh +++ b/test/bin/setup.sh @@ -1,8 +1,12 @@ #!/usr/bin/env bash + +set -x set -e docker pull metaskills/mssql-server-linux-tinytds +docker ps -a -q --filter ancestor=metaskills/mssql-server-linux-tinytds + container=$(docker ps -a -q --filter ancestor=metaskills/mssql-server-linux-tinytds) if [[ -z $container ]]; then docker run -p 1433:1433 -d metaskills/mssql-server-linux-tinytds && sleep 10 From 3e953dc8af4bf97e08ed2d98fb8acbc34f979376 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 18 Dec 2016 12:22:35 -0500 Subject: [PATCH 5/6] Use env vars for TravisCI and remove docker debug. --- .travis.yml | 4 ++++ test/bin/setup.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c123fe34..826ceefa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ sudo: required cache: bundler services: - docker +env: + global: + - TESTOPTS="-v" + - TINYTDS_UNIT_HOST=localhost rvm: - 2.1.9 - 2.2.5 diff --git a/test/bin/setup.sh b/test/bin/setup.sh index 10ab6e50..fb73f35c 100755 --- a/test/bin/setup.sh +++ b/test/bin/setup.sh @@ -5,8 +5,6 @@ set -e docker pull metaskills/mssql-server-linux-tinytds -docker ps -a -q --filter ancestor=metaskills/mssql-server-linux-tinytds - container=$(docker ps -a -q --filter ancestor=metaskills/mssql-server-linux-tinytds) if [[ -z $container ]]; then docker run -p 1433:1433 -d metaskills/mssql-server-linux-tinytds && sleep 10 From 91d2a8d055fcb25ec034689cc929141b5816c754 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Sun, 18 Dec 2016 12:39:15 -0500 Subject: [PATCH 6/6] Leaner Appveyor builds. --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 5adb9c6a..66100f3a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,7 @@ init: - SET TESTOPTS='-v' clone_depth: 5 skip_tags: true +skip_branch_with_pr: true matrix: fast_finish: true install: