commit 747dd5cc7354bc78e2ca5676d78e36d8741cbb10 parent 6d487a2ef4cb843c98d38621f16cedba3bd2c9d9 Author: Antoine A <> Date: Tue, 11 Feb 2025 15:44:07 +0100 common: improve CI Diffstat:
| M | contrib/ci/jobs/2-test/config.ini | | | 1 | - |
| M | contrib/ci/jobs/2-test/job.sh | | | 17 | +++++++++++++++-- |
| D | contrib/ci/jobs/2-test/test.sh | | | 16 | ---------------- |
3 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/contrib/ci/jobs/2-test/config.ini b/contrib/ci/jobs/2-test/config.ini @@ -2,4 +2,3 @@ HALT_ON_FAILURE = False WARN_ON_FAILURE = True CONTAINER_BUILD = True -CONTAINER_NAME = localhost/taler-rust diff --git a/contrib/ci/jobs/2-test/job.sh b/contrib/ci/jobs/2-test/job.sh @@ -1,9 +1,21 @@ #!/bin/bash set -exuo pipefail +# Update system apt-get update -yq apt-get upgrade -yq -job_dir=$(dirname "${BASH_SOURCE[0]}") +# Setup postgres cluster +sudo -u postgres pg_ctlcluster 15 main start +sudo -u postgres createuser root --superuser +sudo -u postgres createdb -O root taler_rust_check -"${job_dir}"/test.sh +check_command() +{ + make check &> test-suite.log +} + +if ! check_command ; then + cat test-suite.log + exit 1 +fi +\ No newline at end of file diff --git a/contrib/ci/jobs/2-test/test.sh b/contrib/ci/jobs/2-test/test.sh @@ -1,16 +0,0 @@ -#!/bin/bash -set -evu - -sudo -u postgres pg_ctlcluster 15 main start -sudo -u postgres createuser root --superuser -sudo -u postgres createdb -O root taler_rust_check - -check_command() -{ - make check &> test-suite.log -} - -if ! check_command ; then - cat test-suite.log - exit 1 -fi