From f48e447fffd2b99ab8e7bb90f48bab85e37bc198 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Wed, 13 Jan 2016 16:00:04 +0100 Subject: [PATCH 1/8] Migrate from Travis legacy to Travis container-based infrastructure --- .travis.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff3e420..74e47c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +sudo: false + language: php php: @@ -23,15 +25,20 @@ matrix: env: - PHPCS=1 +addons: + apt: + sources: + - r-packages-precise + packages: + - r-base + - r-cran-rserve + before_script: - sh -c "composer global require 'phpunit/phpunit=3.7.33'" - sh -c "ln -s ~/.composer/vendor/phpunit/phpunit/PHPUnit ./app/Vendor/PHPUnit" - - sudo sh -c "echo deb http://cran.rstudio.com/bin/linux/ubuntu precise/ >> /etc/apt/sources.list.d/rstudio.list" - - sudo apt-get update -qq - - sudo apt-get install -y --force-yes r-base r-cran-rserve - - sudo Rscript -e "install.packages(c('gplots'),,'http://cran.rstudio.com')" - - sudo Rscript -e "install.packages(c('psy'),,'http://cran.rstudio.com')" - - sudo R CMD Rserve + - Rscript -e "install.packages(c('gplots'),,'http://cran.rstudio.com')" + - Rscript -e "install.packages(c('psy'),,'http://cran.rstudio.com')" + - R CMD Rserve - sh -c "mysql -e 'CREATE DATABASE qdnatool_test;'" - chmod -R 777 ./app/tmp - composer install --dev --no-interaction --prefer-source From c6dc6644641b94616aed0c6ed28d521c4be423e5 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Wed, 13 Jan 2016 18:15:12 +0100 Subject: [PATCH 2/8] Migrate from Travis legacy to Travis container-based infrastructure --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74e47c2..21e3730 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ -sudo: false - language: php +sudo: false + php: - 5.3 - 5.4 @@ -33,12 +33,14 @@ addons: - r-base - r-cran-rserve -before_script: - - sh -c "composer global require 'phpunit/phpunit=3.7.33'" - - sh -c "ln -s ~/.composer/vendor/phpunit/phpunit/PHPUnit ./app/Vendor/PHPUnit" +install: - Rscript -e "install.packages(c('gplots'),,'http://cran.rstudio.com')" - Rscript -e "install.packages(c('psy'),,'http://cran.rstudio.com')" - R CMD Rserve + +before_script: + - sh -c "composer global require 'phpunit/phpunit=3.7.33'" + - sh -c "ln -s ~/.composer/vendor/phpunit/phpunit/PHPUnit ./app/Vendor/PHPUnit" - sh -c "mysql -e 'CREATE DATABASE qdnatool_test;'" - chmod -R 777 ./app/tmp - composer install --dev --no-interaction --prefer-source From 88b631de0e95c67ece1218fbcc78bb877c9a7724 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Wed, 13 Jan 2016 23:36:16 +0100 Subject: [PATCH 3/8] Migrate from Travis legacy to Travis container-based infrastructure --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21e3730..af55061 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,8 +34,12 @@ addons: - r-cran-rserve install: - - Rscript -e "install.packages(c('gplots'),,'http://cran.rstudio.com')" - - Rscript -e "install.packages(c('psy'),,'http://cran.rstudio.com')" + - mkdir -p ~/Rlib + - echo 'R_LIBS=~/Rlib' > .Renviron + - echo 'options(repos = "http://cran.rstudio.com")' > .Rprofile + - echo '.travis.yml' > .Rbuildignore + - Rscript -e 'if(!"gplots" %in% rownames(installed.packages())) { install.packages("gplots", dependencies = TRUE) }' + - Rscript -e 'if(!"psy" %in% rownames(installed.packages())) { install.packages("psy", dependencies = TRUE) }' - R CMD Rserve before_script: From a72de624f4b830bf32291ec73881e503beb19146 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Wed, 13 Jan 2016 23:46:56 +0100 Subject: [PATCH 4/8] Migrate from Travis legacy to Travis container-based infrastructure --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af55061..ed72443 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,8 @@ install: - echo 'options(repos = "http://cran.rstudio.com")' > .Rprofile - echo '.travis.yml' > .Rbuildignore - Rscript -e 'if(!"gplots" %in% rownames(installed.packages())) { install.packages("gplots", dependencies = TRUE) }' - - Rscript -e 'if(!"psy" %in% rownames(installed.packages())) { install.packages("psy", dependencies = TRUE) }' + - Rscript -e 'if(!"psy" %in% rownames(installed.packages())) { install.packages("psy", dependencies = TRUE) }' + - Rscript -e 'if(!"Rserve" %in% rownames(installed.packages())) { install.packages("Rserve", dependencies = TRUE) }' - R CMD Rserve before_script: From d28747c505505947e539a17fe2ef3b993ead3b95 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Wed, 13 Jan 2016 23:55:44 +0100 Subject: [PATCH 5/8] Migrate from Travis legacy to Travis container-based infrastructure --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ed72443..e39864b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,8 @@ install: - echo '.travis.yml' > .Rbuildignore - Rscript -e 'if(!"gplots" %in% rownames(installed.packages())) { install.packages("gplots", dependencies = TRUE) }' - Rscript -e 'if(!"psy" %in% rownames(installed.packages())) { install.packages("psy", dependencies = TRUE) }' - - Rscript -e 'if(!"Rserve" %in% rownames(installed.packages())) { install.packages("Rserve", dependencies = TRUE) }' + - ln -s /usr/lib/R/site-library/Rserve/libs/Rserve ~/Rlib/Rserve + - ln -s /usr/lib/R/site-library/Rserve/libs/Rserve.db ~/Rlib/Rserve.db - R CMD Rserve before_script: From 0a81a2116e201e5fcc12cffb57073baf7f4fa5e9 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Thu, 14 Jan 2016 10:24:49 +0100 Subject: [PATCH 6/8] Migrate from Travis legacy to Travis container-based infrastructure --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e39864b..f7154fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,7 @@ install: - echo '.travis.yml' > .Rbuildignore - Rscript -e 'if(!"gplots" %in% rownames(installed.packages())) { install.packages("gplots", dependencies = TRUE) }' - Rscript -e 'if(!"psy" %in% rownames(installed.packages())) { install.packages("psy", dependencies = TRUE) }' - - ln -s /usr/lib/R/site-library/Rserve/libs/Rserve ~/Rlib/Rserve - - ln -s /usr/lib/R/site-library/Rserve/libs/Rserve.db ~/Rlib/Rserve.db - - R CMD Rserve + - R CMD /usr/local/lib/R/site-library/Rserve/libs/Rserve before_script: - sh -c "composer global require 'phpunit/phpunit=3.7.33'" From 291e30972e9c0ae6637d8a4dc905a6a394971f34 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Thu, 14 Jan 2016 10:38:49 +0100 Subject: [PATCH 7/8] Migrate from Travis legacy to Travis container-based infrastructure --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f7154fb..94e0819 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ install: - echo '.travis.yml' > .Rbuildignore - Rscript -e 'if(!"gplots" %in% rownames(installed.packages())) { install.packages("gplots", dependencies = TRUE) }' - Rscript -e 'if(!"psy" %in% rownames(installed.packages())) { install.packages("psy", dependencies = TRUE) }' - - R CMD /usr/local/lib/R/site-library/Rserve/libs/Rserve + - R CMD /usr/lib/R/site-library/Rserve/libs/Rserve before_script: - sh -c "composer global require 'phpunit/phpunit=3.7.33'" From cc5149f46454a3f5ef809e8bee3bf3668f8a0d00 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Thu, 14 Jan 2016 11:28:59 +0100 Subject: [PATCH 8/8] Migrate from Travis legacy to Travis container-based infrastructure --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 94e0819..e526895 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ install: - echo '.travis.yml' > .Rbuildignore - Rscript -e 'if(!"gplots" %in% rownames(installed.packages())) { install.packages("gplots", dependencies = TRUE) }' - Rscript -e 'if(!"psy" %in% rownames(installed.packages())) { install.packages("psy", dependencies = TRUE) }' - - R CMD /usr/lib/R/site-library/Rserve/libs/Rserve + - R CMD Rserve before_script: - sh -c "composer global require 'phpunit/phpunit=3.7.33'"