# HG changeset patch # User Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> # Date 1608210557 -3600 # Node ID c436b51311962a317ec3b8966b92f8f8b856af9b # Parent 81d45b439e58e948e277557ccdc33da177d6520a Also run the tests diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml --- a/.github/workflows/runtests.yml +++ b/.github/workflows/runtests.yml @@ -16,13 +16,13 @@ jobs: set -x -e lsb_release -c -s sudo apt-get update -qq - sudo apt-get install -y software-properties-common curl make + sudo apt-get install -qqy software-properties-common curl make curl -s https://www.monetdb.org/downloads/MonetDB-GPG-KEY | sudo apt-key add - sudo add-apt-repository "deb http://dev.monetdb.org/downloads/deb/ $(lsb_release -c -s) monetdb" sudo apt-get update -qq - sudo apt-get install -y monetdb5-server + sudo apt-get install -qqy monetdb5-server - name: Run Unit-Tests run: | set -x -e - ./build.sh + ./runtests.sh diff --git a/build.sh b/build.sh deleted file mode 100755 --- a/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -e -x - -export PERL5LIB=$PWD/MonetDB-CLI-MapiPP:$PWD/MonetDB-CLI:$PWD - -for i in DBD MonetDB-CLI/MonetDB MonetDB-CLI-MapiPP/MonetDB/CLI -do - ( - cd $i - perl Makefile.PL - make - ) -done diff --git a/runtests.sh b/runtests.sh --- a/runtests.sh +++ b/runtests.sh @@ -24,6 +24,16 @@ fi export DBI_DSN=dbi:monetdb:database=perltestdb export PERL5LIB=$PWD/MonetDB-CLI-MapiPP:$PWD/MonetDB-CLI:$PWD + +for i in DBD MonetDB-CLI/MonetDB MonetDB-CLI-MapiPP/MonetDB/CLI +do + ( + cd $i + perl Makefile.PL + make + ) +done + make -C DBD test : make -C MonetDB-CLI/MonetDB test