Fixed test action

Signed-off-by: Janos SUTO <[email protected]>
jsuto · Apr 13, 2024 · 152e80d · 152e80d
1 parent bc510a4
commit 152e80d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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 }}