From 27f9f322694d5fc2912e85e40f7d63979e69f4d8 Mon Sep 17 00:00:00 2001
From: Filip Tibell <filip.tibell@gmail.com>
Date: Sat, 6 May 2023 13:10:05 +0200
Subject: [PATCH] Move binaries in release workflow to let release action find
 them

---
 .github/workflows/release.yaml | 29 +++++++++++++++++++----------
 .justfile                      | 12 ------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index fa0d490..96a71fe 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -124,20 +124,29 @@ jobs:
         with:
           path: ./binaries
 
-      - name: List binaries
+      - name: MOVE binaries
         shell: bash
         run: |
           cd ./binaries
           ls -lhrt
-          for DIR in */ ; do
-              cd "$DIR"
-              for FILE in * ; do
-                  if [ ! -d "$FILE" ]; then
-                      echo "$DIR$FILE"
-                  fi
-              done
-              cd ..
+          for DIR in * ; do
+              if [ -d "$DIR" ]; then
+                  cd "$DIR"
+                  echo "$DIR"
+                  for FILE in * ; do
+                      if [ ! -d "$FILE" ]; then
+                          echo "> $FILE"
+                          if [ "$FILE" = "release.zip" ]; then
+                              mv "$FILE" "../$DIR.zip"
+                              echo "> MOVED"
+                              rm -rf "$DIR"
+                          fi
+                      fi
+                  done
+                  cd ..
+              fi
           done
+          ls -lhrt
           cd ..
 
       - name: Create release
@@ -148,5 +157,5 @@ jobs:
           name: ${{ needs.init.outputs.version }}
           tag_name: v${{ needs.init.outputs.version }}
           fail_on_unmatched_files: true
-          files: ./binaries/lune-**
+          files: ./binaries/lune-*.zip
           draft: true
diff --git a/.justfile b/.justfile
index ffcc203..c247ba6 100644
--- a/.justfile
+++ b/.justfile
@@ -32,15 +32,3 @@ generate-gitbook:
 # Publish gitbook directory to gitbook branch
 publish-gitbook: generate-gitbook
 	npx push-dir --dir=gitbook --branch=gitbook
-
-list:
-	#!/usr/bin/env bash
-	for DIR in */ ; do
-		cd "$DIR"
-		for FILE in * ; do
-			if [ ! -d "$FILE" ]; then
-				echo "$DIR$FILE"
-			fi
-		done
-		cd ..
-	done