From 152e80d4dba69222fba2f2fb50e99f71945dcf22 Mon Sep 17 00:00:00 2001 From: Janos SUTO Date: Sat, 13 Apr 2024 22:00:38 +0200 Subject: [PATCH] Fixed test action Signed-off-by: Janos SUTO --- .github/actions/test/action.yaml | 9 +++++++-- .github/workflows/test.yaml | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/actions/test/action.yaml b/.github/actions/test/action.yaml index 91ce0708..b45c3f16 100644 --- a/.github/actions/test/action.yaml +++ b/.github/actions/test/action.yaml @@ -7,6 +7,8 @@ inputs: required: true CONFIG_SITE_PHP: required: true + CONTAINER: + required: true EML_DIR: required: true SMTP_SOURCE_PROG: @@ -33,7 +35,6 @@ runs: - name: Start containers run: | export VERSION=${{ inputs.TEST_TAG }}-${{ inputs.ARCH }} - export CONTAINER="piler" pushd docker docker compose up -d i=0 @@ -50,9 +51,12 @@ runs: shell: bash env: ARCHIVE_HOST: ${{ inputs.ARCHIVE_HOST }} + CONTAINER: ${{ inputs.CONTAINER }} - name: Remove stale images - run: yes|docker image prune + run: | + yes | docker image prune || true + shell: bash - name: Setup piler run: | @@ -67,6 +71,7 @@ runs: shell: bash env: ARCHIVE_HOST: ${{ inputs.ARCHIVE_HOST }} + CONTAINER: ${{ inputs.CONTAINER }} EML_DIR: ${{ inputs.EML_DIR }} SMTP_SOURCE_PROG: ${{ inputs.SMTP_SOURCE_PROG }} SMTP_HOST: ${{ inputs.SMTP_HOST }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 16d8e221..78c73b26 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -66,6 +66,7 @@ jobs: ARCH: ${{ env.ARCH }} ARCHIVE_HOST: ${{ vars.ARCHIVE_HOST }} CONFIG_SITE_PHP: ${{ vars.CONFIG_SITE_PHP }} + CONTAINER: 'piler' EML_DIR: ${{ vars.EML_DIR }} SMTP_SOURCE_PROG: ${{ vars.SMTP_SOURCE_PROG }} SMTP_HOST: ${{ vars.SMTP_HOST }}