Merge branch 'master' of github.com:libretro/Mu

.gitlab-ci.yml

@@ -42,15 +42,19 @@ include:
   # Nintendo GameCube
   - project: 'libretro-infrastructure/ci-templates'
     file: '/ngc-static.yml'
+    
+  # Nintendo Wii
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/wii-static.yml'
+
+  # Nintendo WiiU
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/wiiu-static.yml'
 
   # Nintendo Switch
   - project: 'libretro-infrastructure/ci-templates'
     file: '/libnx-static.yml'
 
-  # Nintendo Wii
-  - project: 'libretro-infrastructure/ci-templates'
-    file: '/wii-static.yml'
-
   # Nintendo Wii U
   - project: 'libretro-infrastructure/ci-templates'
     file: '/wiiu-static.yml'
@@ -136,12 +140,6 @@ libretro-build-ngc:
     - .libretro-ngc-static-retroarch-master
     - .core-defs
 
-# Nintendo Switch
-libretro-build-libnx-aarch64:
-  extends:
-    - .libretro-libnx-static-retroarch-master
-    - .core-defs
-
 # Nintendo Wii
 libretro-build-wii:
   extends:
@@ -154,6 +152,12 @@ libretro-build-wiiu:
     - .libretro-wiiu-static-retroarch-master
     - .core-defs
 
+# Nintendo Switch
+libretro-build-libnx-aarch64:
+  extends:
+    - .libretro-libnx-static-retroarch-master
+    - .core-defs
+
 # PlayStation 2
 libretro-build-ps2:
   extends: