From 0e5ce2322a8b37f08223ac93dd17a83229b127ab Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <dima@doty.ru>
Date: Thu, 25 Aug 2022 13:00:38 +0300
Subject: [PATCH] Use pushd and popd for output/images

---
 .github/workflows/matrix_build.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml
index a75cb2c1..124d9ef2 100644
--- a/.github/workflows/matrix_build.yml
+++ b/.github/workflows/matrix_build.yml
@@ -446,9 +446,9 @@ jobs:
 
           make BOARD=$BOARD all
 
+          pushd output/images
           check_exceeded() {
-            FILE=${GITHUB_WORKSPACE}/output/images/${1}
-            ACTUAL=$(stat --printf="%s" ${FILE})
+            ACTUAL=$(stat --printf="%s" ${1})
             if [[ ${ACTUAL} -gt ${2} ]]; then
               OVERRUN=$((${ACTUAL}-${2}))
               echo "TG_NOTIFY=Warning, ${1} size exceeded by ${OVERRUN}... ${{ matrix.platform }} (${{ matrix.release }})" >> $GITHUB_ENV
@@ -459,10 +459,10 @@ jobs:
           check_exceeded uImage ${MAX_UIMAGE_LITE}
           check_exceeded rootfs.squashfs ${MAX_ROOTFS_LITE}
 
+          md5sum uImage > uImage.${{ matrix.platform }}.md5sum
           mv uImage uImage.${{ matrix.platform }}
+          md5sum rootfs.squashfs > rootfs.squashfs.${{ matrix.platform }}.md5sum
           mv rootfs.squashfs rootfs.squashfs.${{ matrix.platform }}
-          md5sum rootfs.squashfs.${{ matrix.platform }} > rootfs.squashfs.${{ matrix.platform }}.md5sum
-          md5sum uImage.${{ matrix.platform }} > uImage.${{ matrix.platform }}.md5sum
           tar -cvzf $NORFW_PATH uImage* *rootfs.squashfs.${{ matrix.platform }}*
 
           if [ "$HAS_NAND" == "y" ]; then
@@ -472,10 +472,11 @@ jobs:
             echo "NANDFW_FILE=$NANDFW_FILE" >> $GITHUB_ENV
 
             mv rootfs.ubi rootfs.ubi.${{ matrix.platform }}
+            md5sum rootfs.ubifs > rootfs.ubifs.${{ matrix.platform }}.md5sum
             mv rootfs.ubifs rootfs.ubifs.${{ matrix.platform }}
-            md5sum rootfs.ubifs.${{ matrix.platform }} > rootfs.ubifs.${{ matrix.platform }}.md5sum
             tar -cvzf $NANDFW_PATH uImage* *rootfs.ubi*.${{ matrix.platform }}*
           fi
+          popd
 
       - name: Send error message to telegram channel
         env: