From edc115c1439712dbb46164b65f7d3cded1b51ada Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@gmail.com>
Date: Thu, 12 May 2022 23:30:03 +0300
Subject: [PATCH] Refactor

---
 .github/actions/load-image/action.yml        | 2 --
 .github/workflows/sub-build-upload-image.yml | 2 +-
 .github/workflows/sub-tag-push-images.yml    | 4 ++--
 .github/workflows/sub-test-image.yml         | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/actions/load-image/action.yml b/.github/actions/load-image/action.yml
index 8c99b644..c76cccca 100644
--- a/.github/actions/load-image/action.yml
+++ b/.github/actions/load-image/action.yml
@@ -15,13 +15,11 @@ runs:
   using: "composite"
   steps:
     - name: Download built image 📥
-      if: ${{ inputs.image != '' }}
       uses: actions/download-artifact@v3
       with:
         name: ${{ inputs.image }}-${{ inputs.platform }}
         path: /tmp/
     - name: Load downloaded image to docker 📥
-      if: ${{ inputs.image != '' }}
       run: |
         docker load --input /tmp/${{ inputs.image }}-${{ inputs.platform }}.tar
         docker image ls -a
diff --git a/.github/workflows/sub-build-upload-image.yml b/.github/workflows/sub-build-upload-image.yml
index 18aaf48f..a5db7c57 100644
--- a/.github/workflows/sub-build-upload-image.yml
+++ b/.github/workflows/sub-build-upload-image.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Create dev environment 📦
         uses: ./.github/actions/create-dev-env
 
-      - name: Download parent built image 📥
+      - name: Load parent built image to docker 📥
         if: ${{ inputs.parentImage != '' }}
         uses: ./.github/actions/load-image
         with:
diff --git a/.github/workflows/sub-tag-push-images.yml b/.github/workflows/sub-tag-push-images.yml
index 67c00e7f..d23197ba 100644
--- a/.github/workflows/sub-tag-push-images.yml
+++ b/.github/workflows/sub-tag-push-images.yml
@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        image: ${{fromJson(inputs.images)}}
+        image: ${{ fromJson(inputs.images) }}
 
     steps:
       - name: Checkout Repo ⚡️
@@ -30,7 +30,7 @@ jobs:
       - name: Create dev environment 📦
         uses: ./.github/actions/create-dev-env
 
-      - name: Download built image 📥
+      - name: Load image to docker 📥
         uses: ./.github/actions/load-image
         with:
           image: ${{ matrix.image }}
diff --git a/.github/workflows/sub-test-image.yml b/.github/workflows/sub-test-image.yml
index 73b1db9d..99608798 100644
--- a/.github/workflows/sub-test-image.yml
+++ b/.github/workflows/sub-test-image.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Create dev environment 📦
         uses: ./.github/actions/create-dev-env
 
-      - name: Download built image 📥
+      - name: Load image to docker 📥
         uses: ./.github/actions/load-image
         with:
           image: ${{ inputs.image }}