From 7d966855c719955d06bb44048b06dbd82ec0b27f Mon Sep 17 00:00:00 2001 From: Christian Loos Date: Mon, 29 Aug 2016 14:17:06 +0200 Subject: [PATCH 1/5] update Perl version add 5.22 and 5.24 remove blead as this isn't supported on travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a38ba37..8089c03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ sudo: false language: perl perl: - - "blead" + - "5.24" + - "5.22" - "5.20" - "5.18" - "5.16" From b7b6ebc61e9d522339508127c8618bc508a57aa1 Mon Sep 17 00:00:00 2001 From: Christian Loos Date: Mon, 29 Aug 2016 14:26:40 +0200 Subject: [PATCH 2/5] Revert "removing mariaDB 10.1 as test from travis - temporary" This reverts commit 6f5f5c4b45b3a200175a2ad935d8eff24987ee7f. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8089c03..d4eeadb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,9 @@ matrix: - addons: mariadb: "10.0" perl: "5.20" -# - addons: -# mariadb: "10.1" -# perl: "5.20" + - addons: + mariadb: "10.1" + perl: "5.20" before_install: - git clone git://github.com/haarg/perl-travis-helper From c18a52c22b23ed193e653f1e1a3750ce2dff4a05 Mon Sep 17 00:00:00 2001 From: Christian Loos Date: Mon, 29 Aug 2016 14:41:36 +0200 Subject: [PATCH 3/5] add MariaDB 10.2 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index d4eeadb..6294e4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,9 @@ matrix: - addons: mariadb: "10.1" perl: "5.20" + - addons: + mariadb: "10.2" + perl: "5.20" before_install: - git clone git://github.com/haarg/perl-travis-helper From 9db37f762b383e5b6846fd5c81f60b1f9260338e Mon Sep 17 00:00:00 2001 From: Christian Loos Date: Mon, 29 Aug 2016 14:56:24 +0200 Subject: [PATCH 4/5] user before_script stage for creating .my.cnf file --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6294e4b..27a0c6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,9 @@ install: - cpanm --quiet --notest Data::Dumper - cpanm --quiet --notest Text::Template - cpanm --quiet --notest JSON - -script: + +before_script: - echo -e "[client]\nuser=root\npassword=\"\"" > .my.cnf - chmod 600 .my.cnf - - ./mysqltuner.pl --idxstat --dbstat + +script: ./mysqltuner.pl --idxstat --dbstat From 51359e5815451bccc45aa154c7cca92d60f28287 Mon Sep 17 00:00:00 2001 From: Christian Loos Date: Mon, 29 Aug 2016 15:14:55 +0200 Subject: [PATCH 5/5] fix indentation --- .travis.yml | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 27a0c6f..e65059c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,44 +2,44 @@ sudo: false language: perl perl: - - "5.24" - - "5.22" - - "5.20" - - "5.18" - - "5.16" - - "5.14" - - "5.12" - - "5.10" - - "5.8" + - "5.24" + - "5.22" + - "5.20" + - "5.18" + - "5.16" + - "5.14" + - "5.12" + - "5.10" + - "5.8" matrix: - include: - - addons: - mariadb: "5.5" - perl: "5.20" - - addons: - mariadb: "10.0" - perl: "5.20" - - addons: - mariadb: "10.1" - perl: "5.20" - - addons: - mariadb: "10.2" - perl: "5.20" + include: + - addons: + mariadb: "5.5" + perl: "5.20" + - addons: + mariadb: "10.0" + perl: "5.20" + - addons: + mariadb: "10.1" + perl: "5.20" + - addons: + mariadb: "10.2" + perl: "5.20" before_install: - - git clone git://github.com/haarg/perl-travis-helper - - source perl-travis-helper/init - - build-perl - - perl -V + - git clone git://github.com/haarg/perl-travis-helper + - source perl-travis-helper/init + - build-perl + - perl -V install: - - cpanm --quiet --notest Data::Dumper - - cpanm --quiet --notest Text::Template - - cpanm --quiet --notest JSON + - cpanm --quiet --notest Data::Dumper + - cpanm --quiet --notest Text::Template + - cpanm --quiet --notest JSON before_script: - - echo -e "[client]\nuser=root\npassword=\"\"" > .my.cnf - - chmod 600 .my.cnf - + - echo -e "[client]\nuser=root\npassword=\"\"" > .my.cnf + - chmod 600 .my.cnf + script: ./mysqltuner.pl --idxstat --dbstat