From 9c0bf5470e8c23493ba8ed52ccc3925a0dc14d9a Mon Sep 17 00:00:00 2001 From: Marcel Timmerman Date: Fri, 20 May 2016 22:16:56 +0200 Subject: [PATCH 1/3] Installing perl6 and panda the way I do on my system instead of rakudobrew on travis-ci --- .gitignore | 1 + .travis.yml | 22 +++++++++---- Travis-ci/install-mongodb.sh | 0 Travis-ci/install-perl6.sh | 60 ++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 6 deletions(-) mode change 100644 => 100755 Travis-ci/install-mongodb.sh create mode 100755 Travis-ci/install-perl6.sh diff --git a/.gitignore b/.gitignore index e203a0f2..19414edc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ Tests/insert* Sandbox/* Travis-ci/M* Travis-ci/m* +Travis-ci/P6* *.log .precomp */.procomp diff --git a/.travis.yml b/.travis.yml index 9e11493f..7f25a10c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,19 +5,29 @@ branches: language: perl6 perl6: - - latest + - 2016.04-134-g9879233 +# - latest # Install mongodb server at ./Travis-ci/MongoDB # -before_install: - - sh $TRAVIS_BUILD_DIR/Travis-ci/install-mongodb.sh 3.0.5 +#before_install: +# - sh $TRAVIS_BUILD_DIR/Travis-ci/install-mongodb.sh 3.0.5 -#env: +env: # - PATH=.:$TRAVIS_BUILD_DIR/Travis-ci/MongoDB:$PATH + - TCI=${TRAVIS_BUILD_DIR}/Travis-ci + - MDB=${TCI}/MongoDB + - P6=${TCI}/P6Software/rakudo/install + - PATH=${P6}/bin:${P6}/share/perl6/site/bin:$PATH + - PERL6LIB=.,lib install: - - rakudobrew build-panda ${TRAVIS_PERL6_VERSION#latest} - - panda installdeps . + - $TRAVIS_BUILD_DIR/Travis-ci/install-mongodb.sh 3.0.5 + - $TRAVIS_BUILD_DIR/Travis-ci/install-perl6.sh ${TRAVIS_PERL6_VERSION} + +# - rakudobrew build-panda ${TRAVIS_PERL6_VERSION#latest} +# - rakudobrew build-panda +# - panda installdeps . # - panda update # - panda install BSON Digest::MD5 diff --git a/Travis-ci/install-mongodb.sh b/Travis-ci/install-mongodb.sh old mode 100644 new mode 100755 diff --git a/Travis-ci/install-perl6.sh b/Travis-ci/install-perl6.sh new file mode 100755 index 00000000..f145d1d8 --- /dev/null +++ b/Travis-ci/install-perl6.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env sh + +#perl6branch=$1 + +#if [ -z $perlbranch ] +#then +# perl6branch='2016.04-134-g9879233' +#fi +#echo V = $perl6branch + +# For tests do "setenv TRAVIS_BUILD_DIR `pwd`" + +cd ${TRAVIS_BUILD_DIR}/Travis-ci +if [ ! -e P6Software ] +then + mkdir P6Software +fi + +cd P6Software + +# 2016.04-134-g9879233, 2016.04-86-g618c6be +#if [ ! -e $perl6branch ] +if [ ! -x rakudo/install/bin/perl6-m ] +then +# touch $perl6branch +# git clone --branch $perl6branch --single-branch git://github.com/rakudo/rakudo.git + git clone --single-branch git://github.com/rakudo/rakudo.git + cd rakudo + perl Configure.pl --gen-moar --backends=moar + make install + cd .. +fi + +P6="${TRAVIS_BUILD_DIR}/Travis-ci/P6Software/rakudo/install" +PATH="${P6}/bin:${P6}/share/perl6/site/bin:/usr/bin" +PERL6LIB=".,lib" + +export PATH + +if [ ! -x rakudo/install/share/perl6/site/bin/panda ] +then + if [ ! -x panda/bin/panda ] + then + git clone --recursive git://github.com/tadzik/panda.git + fi + + cd panda + perl6 bootstrap.pl + cd .. +fi + + +cd .. + +panda --notests install BSON +panda --notests install Config::TOML + +#panda --notests install MongoDB +#panda --notests install +#panda --notests install From eb11d50d1981ca5de4712c6fd324aa643c8b7c4f Mon Sep 17 00:00:00 2001 From: Marcel Timmerman Date: Fri, 20 May 2016 22:17:06 +0200 Subject: [PATCH 2/3] bugfix --- lib/MongoDB/Client.pm6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/MongoDB/Client.pm6 b/lib/MongoDB/Client.pm6 index 44148270..2d534c34 100644 --- a/lib/MongoDB/Client.pm6 +++ b/lib/MongoDB/Client.pm6 @@ -322,7 +322,7 @@ say "Saved monitor data for $server.name() = ", $!servers{$server.name}.perl; $!todo-servers-semaphore.acquire; $!processing-todo-list = $found-new-servers; $!todo-servers-semaphore.release; -say "H6f: Processing after $server.name: $!processing-todo-list"; +say "H6f: Processing after $server.name(): $!processing-todo-list"; #say "\nWait for next from monitor"; #say ' '; } From 46048d7e11dcda16afee8e0a1d28795724befc32 Mon Sep 17 00:00:00 2001 From: Marcel Timmerman Date: Sat, 21 May 2016 08:56:18 +0200 Subject: [PATCH 3/3] travis changes of perl install --- META.info | 2 +- README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/META.info b/META.info index 0d8af814..64d3483e 100644 --- a/META.info +++ b/META.info @@ -32,5 +32,5 @@ "MongoDB": "lib/MongoDB.pm6" }, "source-url": "git://github.com/MARTIMM/mongo-perl6-driver.git", - "version": "v0.30.1" + "version": "v0.30.2" } diff --git a/README.md b/README.md index 4b4730eb..c4817172 100644 --- a/README.md +++ b/README.md @@ -316,6 +316,8 @@ See [semantic versioning](http://semver.org/). Please note point 4. on that page: *Major version zero (0.y.z) is for initial development. Anything may change at any time. The public API should not be considered stable.* +* 0.30.2 + * Try different perl6 installment on Travis-ci * 0.30.1 * Monitor loop-time control via Client and Server interface to quicken the tests * 0.30.0