Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
MARTIMM committed May 21, 2016
2 parents 5379b4a + 46048d7 commit cf75ff5
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -7,6 +7,7 @@ Tests/insert*
Sandbox/*
Travis-ci/M*
Travis-ci/m*
Travis-ci/P6*
*.log
.precomp
*/.procomp
Expand Down
22 changes: 16 additions & 6 deletions .travis.yml
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion META.info
Expand Up @@ -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"
}
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -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
Expand Down
Empty file modified Travis-ci/install-mongodb.sh 100644 → 100755
Empty file.
60 changes: 60 additions & 0 deletions 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
2 changes: 1 addition & 1 deletion lib/MongoDB/Client.pm6
Expand Up @@ -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 ' ';
}
Expand Down

0 comments on commit cf75ff5

Please sign in to comment.