From fecc8f8c534c17aa82b21e6548138f361de18bc3 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Mon, 21 Feb 2022 16:14:26 +0000
Subject: [PATCH 1/3] logs to understand missing artifacts on GSI

---
 src/build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/build.sh b/src/build.sh
index a146e8c..768ada5 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -262,10 +262,13 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           md5sum "IMG-$build" > "IMG-$build.md5sum"
           cd "${OUT}" || return 1
         fi
+        echo "BACKUP_INTERMEDIATE_SYSTEM_IMG ? " $BACKUP_INTERMEDIATE_SYSTEM_IMG
         if [ "$BACKUP_INTERMEDIATE_SYSTEM_IMG" = true ]; then
           mv obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/system.img ./
+          ls obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/
           zip "$ZIP_DIR/$zipsubdir/IMG-$build" system.img
           cd $ZIP_DIR/$zipsubdir
+          ls
           sha256sum "IMG-$build" > "IMG-$build.sha256sum"
           md5sum "IMG-$build" > "IMG-$build.md5sum"
           cd "${OUT}" || return 1
-- 
GitLab


From 79fc182e500b463e08f1f836219331f67d776db2 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Tue, 22 Feb 2022 11:16:13 +0000
Subject: [PATCH 2/3] fix gsi

---
 src/build.sh | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/build.sh b/src/build.sh
index 768ada5..ef27093 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -243,10 +243,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
       echo ">> [$(date)] Moving build artifacts for ${DEVICE} to '$ZIP_DIR/$zipsubdir'"
       cd "${OUT}" || return 1
       for build in $(ls e-*.zip); do
-        #with only systemimage, we don't have a e-*.zip
-        if [ "${BUILD_ONLY_SYSTEMIMAGE}" = true ]; then
-          build=e-`grep lineage.version system/build.prop | sed s/#.*// | sed s/.*=// | tr -d \\n`.zip
-        fi
         sha256sum "$build" > "$ZIP_DIR/$zipsubdir/$build.sha256sum"
         find . -maxdepth 1 -name 'e-*.zip*' -type f -exec mv {} "$ZIP_DIR/$zipsubdir/" \;
 
@@ -262,7 +258,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           md5sum "IMG-$build" > "IMG-$build.md5sum"
           cd "${OUT}" || return 1
         fi
-        echo "BACKUP_INTERMEDIATE_SYSTEM_IMG ? " $BACKUP_INTERMEDIATE_SYSTEM_IMG
         if [ "$BACKUP_INTERMEDIATE_SYSTEM_IMG" = true ]; then
           mv obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/system.img ./
           ls obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/
@@ -289,6 +284,21 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
       	fi
       done
 
+      #with only systemimage, we don't have a e-*.zip
+      if [ "${BUILD_ONLY_SYSTEMIMAGE}" = true ]; then
+        build=e-`grep lineage.version system/build.prop | sed s/#.*// | sed s/.*=// | tr -d \\n`.zip
+        if [ "$BACKUP_INTERMEDIATE_SYSTEM_IMG" = true ]; then
+          mv obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/system.img ./
+          ls obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/
+          zip "$ZIP_DIR/$zipsubdir/IMG-$build" system.img
+          cd $ZIP_DIR/$zipsubdir
+          ls
+          sha256sum "IMG-$build" > "IMG-$build.sha256sum"
+          md5sum "IMG-$build" > "IMG-$build.md5sum"
+          cd "${OUT}" || return 1
+        fi
+      fi
+
       if [ "$IS_EMULATOR" = true -a "$BACKUP_EMULATOR" = true ]; then
         EMULATOR_ARCHIVE="e-android$android_version-eng-$currentdate-linux-x86-img.zip"
         mv ../../../host/linux-x86/sdk_addon/*-img.zip "$ZIP_DIR/$zipsubdir/$EMULATOR_ARCHIVE"
-- 
GitLab


From be127d609b7a70d7cf7ac35988d35a897e17a764 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Tue, 22 Feb 2022 14:05:57 +0000
Subject: [PATCH 3/3] clean

---
 src/build.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/build.sh b/src/build.sh
index ef27093..cb9ff8d 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -260,10 +260,8 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
         fi
         if [ "$BACKUP_INTERMEDIATE_SYSTEM_IMG" = true ]; then
           mv obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/system.img ./
-          ls obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/
           zip "$ZIP_DIR/$zipsubdir/IMG-$build" system.img
           cd $ZIP_DIR/$zipsubdir
-          ls
           sha256sum "IMG-$build" > "IMG-$build.sha256sum"
           md5sum "IMG-$build" > "IMG-$build.md5sum"
           cd "${OUT}" || return 1
@@ -289,10 +287,8 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
         build=e-`grep lineage.version system/build.prop | sed s/#.*// | sed s/.*=// | tr -d \\n`.zip
         if [ "$BACKUP_INTERMEDIATE_SYSTEM_IMG" = true ]; then
           mv obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/system.img ./
-          ls obj/PACKAGING/target_files_intermediates/lineage*/IMAGES/
           zip "$ZIP_DIR/$zipsubdir/IMG-$build" system.img
           cd $ZIP_DIR/$zipsubdir
-          ls
           sha256sum "IMG-$build" > "IMG-$build.sha256sum"
           md5sum "IMG-$build" > "IMG-$build.md5sum"
           cd "${OUT}" || return 1
-- 
GitLab