diff --git a/pandamonium-theorem-prover/.travis.yml b/pandamonium-theorem-prover/.travis.yml index 7489a86..d05b69c 100644 --- a/pandamonium-theorem-prover/.travis.yml +++ b/pandamonium-theorem-prover/.travis.yml @@ -18,15 +18,18 @@ before_script: - mysql -u root pandamonium < pandamonium-theorem-prover/persistence/sql/local_development.sql stages: + - name: load database - name: build - - name: unitTest - - name: integrationTest + - name: unit Test + - name: integration Test jobs: include: + - stage: load database + script: ./pandamonium-theorem-prover/gradlew loaddb - stage: build script: ./pandamonium-theorem-prover/gradlew build - - stage: unitTest + - stage: unit Test script: ./pandamonium-theorem-prover/gradlew test - - stage: integrationTest + - stage: integration Test script: ./pandamonium-theorem-prover/gradlew integrationTest diff --git a/pandamonium-theorem-prover/persistence/build.gradle b/pandamonium-theorem-prover/persistence/build.gradle index 86db24e..24c2f75 100644 --- a/pandamonium-theorem-prover/persistence/build.gradle +++ b/pandamonium-theorem-prover/persistence/build.gradle @@ -28,6 +28,6 @@ dependencies { } task loadDb(type: Exec, group: 'Verification', description: 'Reloads the local database.') { - workingDir "$rootDir/scripts/mysql" + workingDir "./scripts/mysql" commandLine './loaddb.sh' } diff --git a/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh b/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh index 53e35ce..974a80b 100755 --- a/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh +++ b/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash export MYSQL_PWD=secret -for sqlScript in $( find ../../ -name "*.sql" -print | sort); +for sqlScript in $( find . -name "*.sql" -print | sort); do echo "**** $sqlScript ****" mysql --batch --quick --raw --line-numbers --force --user=panda < $sqlScript diff --git a/pandamonium-theorem-prover/persistence/sql/local_development.sql b/pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql similarity index 100% rename from pandamonium-theorem-prover/persistence/sql/local_development.sql rename to pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql