From 50bc5b5dbe0b86f1eaf678610e351f8820dd60fe Mon Sep 17 00:00:00 2001 From: Lacey Sanderson Date: Mon, 19 Aug 2024 17:12:03 -0600 Subject: [PATCH] Check postgresql within docker. --- .github/workflows/main.yml | 2 +- action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca621a4..06dde78 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,7 @@ jobs: modules: tripal php-version: "8.3" pgsql-version: "16" - drupal-version: "10.4.x" + drupal-version: "10.4.x-dev" phpunit-command-options: '--filter testTripalAdminPages' build-image: true dockerfile: "Dockerfile" diff --git a/action.yml b/action.yml index b50d131..06b0672 100644 --- a/action.yml +++ b/action.yml @@ -60,7 +60,7 @@ runs: run: | docker run --publish=80:80 --name=tripaldocker -tid \ --volume=`pwd`:/var/www/drupal/web/modules/contrib/${{ inputs.directory-name }} testing:localdocker - pg_isready -h localhost -p 5432 -t 5 + docker exec tripaldocker pg_isready -h localhost -p 5432 -t 5 # Install the modules - name: Install our package in Docker if: "${{ inputs.modules != '' }}"