.github/workflows/ci.yml

@@ -735,6 +735,12 @@ jobs:
           - driver: docker-container
             load: true
             push: true
+          - driver: docker
+            load: false
+            push: false
+          - driver: docker-container
+            load: false
+            push: false
     services:
       registry:
         image: registry:2
@@ -768,13 +774,9 @@ jobs:
           docker image ls --no-trunc
       -
         name: Check digest
+        if: ${{ matrix.push }}
         run: |
-          if [[ "${{ matrix.driver }}" = "docker-container" ]] && [[ "${{ matrix.load }}" = "false" ]] && [[ "${{ matrix.push }}" = "false" ]]; then
+          if [ -z "${{ steps.docker_build.outputs.digest }}" ]; then
-            if [ -n "${{ steps.docker_build.outputs.digest }}" ]; then
-              echo "::error::Digest should be empty"
-              exit 1
-            fi
-          elif [[ "${{ matrix.push }}" = "true" ]] && [[ -z "${{ steps.docker_build.outputs.digest }}" ]]; then
             echo "::error::Digest should not be empty"
             exit 1
           fi
@@ -787,12 +789,7 @@ jobs:
       -
         name: Check image ID
         run: |
-          if [[ "${{ matrix.driver }}" = "docker-container" ]] && [[ "${{ matrix.load }}" = "false" ]] && [[ "${{ matrix.push }}" = "false" ]]; then
+          if [ -z "${{ steps.docker_build.outputs.imageid }}" ]; then
-            if [ -n "${{ steps.docker_build.outputs.imageid }}" ]; then
-              echo "::error::Image ID should be empty"
-              exit 1
-            fi
-          elif [ -z "${{ steps.docker_build.outputs.imageid }}" ]; then
             echo "::error::Image ID should not be empty"
             exit 1
           fi