From 526211b2967bfdeac26a948c0ecbb0445e4c4bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kn=C3=B6ppler?=
 <6317548+theCalcaholic@users.noreply.github.com>
Date: Sun, 24 Jul 2022 00:00:43 +0200
Subject: build-images.yml: Fix rpi image build (#1510)

* release.yml: Don't publish anything unless triggered by tag

* build-sd-images.yml: Wait until rpi image is unmounted before packing
---
 .github/workflows/build-sd-images.yml | 9 +++++++++
 .github/workflows/release.yml         | 1 +
 2 files changed, 10 insertions(+)

(limited to '.github')

diff --git a/.github/workflows/build-sd-images.yml b/.github/workflows/build-sd-images.yml
index 1608262d..4a2da067 100644
--- a/.github/workflows/build-sd-images.yml
+++ b/.github/workflows/build-sd-images.yml
@@ -33,6 +33,15 @@ jobs:
           IMG="NextCloudPi_RPi_$( date  "+%m-%d-%y" ).img"
           wget -q https://github.com/multiarch/qemu-user-static/releases/latest/download/qemu-aarch64-static -O ./qemu-aarch64-static
           ./build/build-SD-rpi.sh
+
+          for i in {1..10}
+          do
+            sudo losetup | grep "${IMG}" || break;
+            [[ "$i" -lt 10 ]] || { echo "Timeout while waiting for image to unount"; exit 1; }
+            sleep 6
+            echo "Retrying ($i out of 10)"
+          done
+
           echo "::set-output name=image::${IMG}"
       - name: Pack RPI Image
         id: pack-rpi
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0d7ded88..040047d8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,6 +8,7 @@ on:
         type: string
   push:
     tags: ["v*"]
+    branches: ["*/cicd/*"]
 
 jobs:
   build-and-test-lxd:
-- 
cgit v1.2.3