From c9c477f4ea52370e0819a6640450571cf36ae283 Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:06:18 +0100
Subject: [PATCH] Update master.yml

---
 .github/workflows/master.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index f8fc4fa..c2124b3 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -155,17 +155,26 @@ jobs:
 
           TIME=$(date -d @${SECONDS} +%M:%S)
           echo TIME=${TIME} >> ${GITHUB_ENV}
+          COMMON=$(echo ${NAME} | awk -F_ '{print NF-1}')
 
           NORFW=$(find output/images -name openipc*nor*)
           if [ ! -z ${NORFW} ]; then
-            mv ${NORFW} ../${NAME}-nor.tgz
-            echo NORFW=${GITHUB_WORKSPACE}/${NAME}-nor.tgz >> ${GITHUB_ENV}
+            if [ ${COMMON} -eq 1 ]; then
+              echo NORFW=openipc/${NORFW} >> ${GITHUB_ENV}
+            else
+              mv ${NORFW} ../${NAME}-nor.tgz
+              echo NORFW=${NAME}-nor.tgz >> ${GITHUB_ENV}
+            fi
           fi
 
           NANDFW=$(find output/images -name openipc*nand*)
           if [ ! -z ${NANDFW} ]; then
-            mv ${NANDFW} ../${NAME}-nand.tgz
-            echo NANDFW=${GITHUB_WORKSPACE}/${NAME}-nand.tgz >> ${GITHUB_ENV}
+            if [ ${COMMON} -eq 1 ]; then
+              echo NANDFW=openipc/${NANDFW} >> ${GITHUB_ENV}
+            else
+              mv ${NANDFW} ../${NAME}-nand.tgz
+              echo NANDFW=${NAME}-nand.tgz >> ${GITHUB_ENV}
+            fi
           fi
 
           if [ -z ${NORFW} ] && [ -z ${NANDFW} ]; then