From e54e4b93b67fad383626da90680541319ce0713f Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Sun, 21 Apr 2024 11:26:56 +0200
Subject: [PATCH 1/4] Add redirection mode
 FS_LAYER_TYPE_SAVE_REPLACE_IGNORE_VOL_SAVE_COMMON

---
 include/content_redirection/redirection.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/content_redirection/redirection.h b/include/content_redirection/redirection.h
index ed88b2d..88a259f 100644
--- a/include/content_redirection/redirection.h
+++ b/include/content_redirection/redirection.h
@@ -42,6 +42,11 @@ typedef enum FSLayerType {
      * Same as FS_LAYER_TYPE_CONTENT_MERGE, but for /vol/aoc
      */
     FS_LAYER_TYPE_AOC_MERGE,
+
+    /* Redirects the /vol/save to a given path but leaves the /vol/save/common directory as it is.
+     * Existing files in /vol/save/8XXXXXXX will be ignored, only files in the layer (provided via the replacementDir) will be used.
+     */
+    FS_LAYER_TYPE_SAVE_REPLACE_IGNORE_VOL_SAVE_COMMON,
 } FSLayerType;
 
 typedef enum ContentRedirectionStatus {

From 50d6722f5b06fad811829072bb35432016dc6be4 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Sun, 21 Apr 2024 11:27:09 +0200
Subject: [PATCH 2/4] Update github workflow to publish dev docker images

---
 .github/workflows/push_image.yml | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/push_image.yml b/.github/workflows/push_image.yml
index a69fa5e..30dc9a6 100644
--- a/.github/workflows/push_image.yml
+++ b/.github/workflows/push_image.yml
@@ -3,14 +3,32 @@ on:
   push:
     branches:
       - main
+      - '*-dev'
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
+  clang-format-lib:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: clang-format
+      run: |
+        docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./include ./source
+  build-lib:
+    runs-on: ubuntu-22.04
+    needs: clang-format-lib
+    steps:
+    - uses: actions/checkout@v3
+    - name: build binary
+      run: |
+        docker build . -f Dockerfile.buildlocal -t builder
+        docker run --rm -v ${PWD}:/project builder make
   build-and-push-image:
     runs-on: ubuntu-latest
+    needs: [build-lib]
     permissions:
       contents: read
       packages: write
@@ -24,9 +42,11 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value={{date 'YYYYMMDD'}}-{{sha}}
-            type=raw,value={{date 'YYYYMMDD'}}
-            type=raw,value=latest
+            type=raw,value={{branch}}-{{date 'YYYYMMDD'}}-{{sha}},enable=${{ github.ref != format('refs/heads/{0}', 'main') }}
+            type=raw,value={{date 'YYYYMMDD'}}-{{sha}},enable={{is_default_branch}}
+            type=raw,value={{date 'YYYYMMDD'}},enable={{is_default_branch}}
+            type=raw,value=latest,enable={{is_default_branch}}
+
       - name: Log into registry ${{ env.REGISTRY }}
         uses: docker/login-action@v2.1.0
         with:

From 39bba9f0f2e0d488f543e5e2ea6cf510e48929c6 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Wed, 24 Apr 2024 18:01:11 +0200
Subject: [PATCH 3/4] Bump version to 1.1

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 76bb0cd..06c969f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ TOPDIR ?= $(CURDIR)
 include $(DEVKITPRO)/wut/share/wut_rules
 
 export VER_MAJOR	:=	1
-export VER_MINOR	:=	0
+export VER_MINOR	:=	1
 export VER_PATCH	:=	0
 
 VERSION	:=	$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)

From 0655e451369a14a3fafab8951befe32a9186ee9a Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Wed, 24 Apr 2024 18:01:44 +0200
Subject: [PATCH 4/4] Update Dockerfiles to use the latest devkitPPC and wut
 version

---
 Dockerfile            | 2 +-
 Dockerfile.buildlocal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a659647..7afb775 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/wiiu-env/devkitppc:20230621
+FROM ghcr.io/wiiu-env/devkitppc:20240423
 
 WORKDIR tmp_build
 COPY . .
diff --git a/Dockerfile.buildlocal b/Dockerfile.buildlocal
index 250f6cb..36570fe 100644
--- a/Dockerfile.buildlocal
+++ b/Dockerfile.buildlocal
@@ -1,3 +1,3 @@
-FROM ghcr.io/wiiu-env/devkitppc:20230621
+FROM ghcr.io/wiiu-env/devkitppc:20240423
 
 WORKDIR project