diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7409656d..599b895d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,10 +69,6 @@ jobs: env: SOCI_CI: true SOCI_CI_BACKEND: ${{ matrix.backend }} - PGHOST: localhost - PGPORT: 5432 - PGUSER: postgres - PGPASSWORD: Password12! SOCI_MYSQL_ROOT_PASSWORD: root steps: @@ -89,6 +85,20 @@ jobs: set_env_var SOCI_CI_BRANCH $GITHUB_REF set_env_var SOCI_SOURCE_DIR $GITHUB_WORKSPACE set_env_var SOCI_SOURCE_DIR `pwd` + + case "${{runner.os}}" in + Linux) + set_env_var PGHOST localhost + set_env_var PGPORT 5432 + set_env_var PGUSER postgres + set_env_var PGPASSWORD 'Password12!' + ;; + + macOS) + set_env_var PGDATA /usr/local/var/postgres + ;; + esac + if [ "${{matrix.no_boost}}" = true ]; then set_env_var WITH_BOOST OFF fi diff --git a/scripts/ci/before_build_postgresql.sh b/scripts/ci/before_build_postgresql.sh index 76b28e9f..29ca5f3e 100755 --- a/scripts/ci/before_build_postgresql.sh +++ b/scripts/ci/before_build_postgresql.sh @@ -5,5 +5,11 @@ # source ${SOCI_SOURCE_DIR}/scripts/ci/common.sh +if [ $(uname) = Darwin ]; then + pg_ctl start + pg_isready --timeout=60 + createuser --superuser postgres +fi + psql --version psql -c 'create database soci_test;' -U postgres