From 4e941f73fe8ab1dbdae2c499a493ee8728a775aa Mon Sep 17 00:00:00 2001
From: w3irDv <170813473+w3irDv@users.noreply.github.com>
Date: Fri, 30 Aug 2024 16:19:51 +0200
Subject: [PATCH] fix caching and zip generation in github action

---
 .github/workflows/main.yml | 11 +++++------
 Makefile                   | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e3a2ee1..cac4962 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,12 +11,11 @@ jobs:
         with:
           fetch-depth: 0
       - name: Docker Layer Caching
-        uses: jpribyl/action-docker-layer-caching@v0.1.1
+        uses: ScribeMD/docker-cache@0.5.0
         continue-on-error: true
+        id: cache
         with:
-          key: savemii-docker-cache-{hash}
-          restore-keys: |
-            savemii-docker-cache-
+          key: savemii-docker-cache-${{ hashFiles('DockerFile')}}
       - name: Build artifacts
         run: |
           docker build . --file Dockerfile --tag builder
@@ -25,11 +24,11 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: SaveMiiModWUTPort-Aroma
-          path: SaveMiiModWUTPort-Aroma.zip
+          path: build/Aroma/*
           if-no-files-found: warn
       - name: Upload HBL version
         uses: actions/upload-artifact@v4
         with:
           name: SaveMiiModWUTPort-HBL
-          path: SaveMiiModWUTPort-HBL.zip
+          path: build/HBL/*
           if-no-files-found: warn
diff --git a/Makefile b/Makefile
index a263acb..d060588 100644
--- a/Makefile
+++ b/Makefile
@@ -156,13 +156,16 @@ clean:
 
 #-------------------------------------------------------------------------------
 release: $(BUILD)
-	@mkdir -p SaveMiiModWUTPort
-	@cp savemii.rpx SaveMiiModWUTPort
-	@cp meta/hbl/icon.png SaveMiiModWUTPort
-	@cp meta/hbl/meta.xml SaveMiiModWUTPort
-	@zip -9 -r SaveMiiModWUTPort-HBL.zip SaveMiiModWUTPort
-	@zip -9 SaveMiiModWUTPort-Aroma.zip savemii.wuhb
-	@rm -rf SaveMiiModWUTPort
+	@mkdir -p build/Aroma/wiiu/apps/SaveMiiModWUTPort
+	@mkdir -p build/HBL/wiiu/apps/SaveMiiModWUTPort
+	@rm -rf build/Aroma/wiiu/apps/SaveMiiModWUTPort/*
+	@rm -rf build/HBL/wiiu/apps/SaveMiiModWUTPort/*
+	@cp savemii.rpx build/HBL/wiiu/apps/SaveMiiModWUTPort
+	@cp meta/hbl/icon.png build/HBL/wiiu/apps/SaveMiiModWUTPort
+	@cp meta/hbl/meta.xml build/HBL/wiiu/apps/SaveMiiModWUTPort
+	@cp savemii.wuhb build/Aroma/wiiu/apps/SaveMiiModWUTPort
+	@zip -9 -r SaveMiiModWUTPort-HBL.zip build/HBL
+	@zip -9 -r SaveMiiModWUTPort-Aroma.zip build/Aroma
 #-------------------------------------------------------------------------------
 else
 .PHONY:	all