.github/workflows/push_image.yml

@@ -3,32 +3,14 @@ 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
@@ -42,11 +24,9 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            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}}
-
+            type=raw,value={{date 'YYYYMMDD'}}-{{sha}}
+            type=raw,value={{date 'YYYYMMDD'}}
+            type=raw,value=latest
       - name: Log into registry ${{ env.REGISTRY }}
         uses: docker/login-action@v2.1.0
         with:

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/wiiu-env/devkitppc:20240423
+FROM ghcr.io/wiiu-env/devkitppc:20230621
 
 WORKDIR tmp_build
 COPY . .

Dockerfile.buildlocal

@@ -1,3 +1,3 @@
-FROM ghcr.io/wiiu-env/devkitppc:20240423
+FROM ghcr.io/wiiu-env/devkitppc:20230621
 
 WORKDIR project

Makefile

@@ -11,7 +11,7 @@ TOPDIR ?= $(CURDIR)
 include $(DEVKITPRO)/wut/share/wut_rules
 
 export VER_MAJOR	:=	1
-export VER_MINOR	:=	1
+export VER_MINOR	:=	0
 export VER_PATCH	:=	0
 
 VERSION	:=	$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)

include/content_redirection/redirection.h

@@ -42,11 +42,6 @@ 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 {