github-mirror/vanilla
1
0 Fork 0
mirror of https://github.com/vanilla-wiiu/vanilla.git synced 2026-10-28 09:43:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 7cb57b109f0eeade821d080a31975631cc8d2e56
Merge: 4fd52e4 08a3466
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed May 6 18:10:14 2026 -0700

    Merge branch 'master' into new-ci

commit 4fd52e44530f820d89e618e68181f40f4bc54c6c
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed May 6 18:09:59 2026 -0700

    docker: update for new system

commit bd055a288e8c536ac606655096b831256a0a16b4
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed May 6 18:08:55 2026 -0700

    Update platform_nx_imu.c

commit f8e4d62e84a9efcde2b0aa0f4c3e6f855f65f458
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed May 6 17:39:05 2026 -0700

    gui: fix inverted gyroscope axis with nintendo switch

commit f679b7cd4ce75c0343f8da5f4e3810346c127f09
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed May 6 16:03:55 2026 -0700

    ci: fix file path

commit 5b66a246ceded84267a03e960e2ec30b76f1f563
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed May 6 16:02:12 2026 -0700

    ci: keep docker but incorporate buildroot build

commit 882a18aba5c41a1b00750f9e1e3d5b2f012bb8ba
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed May 6 14:01:16 2026 -0700

    ci: sign APK in CI rather than docker

    Simplifies process and improves security

commit a8d8567b1d3fc7f2cf86dc90ab316bda2beac4bb
Author: MattKC <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue May 5 13:29:45 2026 -0700

    ci: stupid cache action can't handle a relative path

commit 1b248a9a3bf6ee8158e1ac3dda432600bace528a
Author: MattKC <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue May 5 12:17:24 2026 -0700

    ci: actually provide path to cache

commit 01f4f4055665638e28a76cd916b4fd7f2678b49d
Author: MattKC <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue May 5 11:00:33 2026 -0700

    Update build.yml

commit 83b1cefc156e1967f1eacfb53cdaf010f3ff7e11
Author: MattKC <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue May 5 10:58:46 2026 -0700

    Rename vanilla_nx_defconfig to vanilla_nintendoswitch_defconfig

commit ef8899d88b403606cf6e4992037ee12d000f5d75
Author: MattKC <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue May 5 10:58:05 2026 -0700

    Update build.yml [skip ci]

commit 1e3d9a3f54a49c0892aa6c3968a1206792f13008
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue May 5 09:55:25 2026 -0700

    ci: found em

commit 23934ced2dc6555f3676b1078ed36475e9bd6a20
Author: MattKC <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue May 5 08:57:43 2026 -0700

    ci: just list all the files so i can see where the image ended up

commit 1d597cd34b94ab8f14e44bac6559da3904743559
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon May 4 17:54:22 2026 -0700

    ci: maybe fix path

commit 4bdcae22c5d9ff1fd863f7447c5d346a632a3667
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon May 4 16:57:18 2026 -0700

    ci: fix path

commit 2be8b79c32ed42fdc0fbf12e012300e0b44501c8
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon May 4 16:55:49 2026 -0700

    ci: fix missing defconfig

commit fe8990e2abd5b38839235b48a3870cfbbe0bdeb6
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon May 4 15:38:44 2026 -0700

    ci: fix path

commit 8e19c7264297b5df37a127da151fe2d85767006c
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon May 4 15:19:05 2026 -0700

    ci: fix path

commit 9a44bfa3cd36db8868b3f011c9af27e8729d5f93
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon May 4 15:01:20 2026 -0700

    ci: split buildroot off
This commit is contained in:
itsmattkc committed 2026-05-06 21:16:17 -07:00
1 parent 08a3466681
commit f956b9c356
11 files changed
+50 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/build.yml
+13 -3
View File
@@ -51,7 +51,8 @@ jobs:
- name: Build Docker image
uses: docker/build-push-action@v6
with:
context: docker/${{ matrix.platform.os }}
context: .
file: docker/${{ matrix.platform.os }}/Dockerfile
build-args: |
ARCH=${{ matrix.platform.arch }}
tags: vanilla-${{ matrix.platform.os }}-${{ matrix.platform.arch }}
@@ -64,7 +65,6 @@ jobs:
docker run \
-v "${{ github.workspace }}:/vanilla" \
-v "${{ github.workspace }}/build:/install" \
-e ANDROID_SIGNING_KEY=${{ secrets.ANDROID_SIGNING_KEY }} \
vanilla-${{ matrix.platform.os }}-${{ matrix.platform.arch }}
- name: Archive (Linux)
@@ -81,7 +81,17 @@ jobs:
- name: Archive (Android)
if: ${{ matrix.platform.os == 'android' }}
run: |
cp build/app-release.apk ${{ matrix.platform.artifact }}
if [ -n "${{ secrets.ANDROID_SIGNING_KEY }}" ]; then
docker run \
-v "${{ github.workspace }}:/vanilla" \
-v "${{ github.workspace }}/build:/install" \
--entrypoint apksigner \
vanilla-${{ matrix.platform.os }}-${{ matrix.platform.arch }} \
sign --ks /vanilla/docker/android/vanilla.jks --out /install/app-release-signed.apk --ks-pass pass:${{ secrets.ANDROID_SIGNING_KEY }} /install/app-release.apk
cp build/app-release-signed.apk ${{ matrix.platform.artifact }}
else
cp build/app-release.apk ${{ matrix.platform.artifact }}
fi
- name: Upload a Build Artifact
uses: actions/upload-artifact@v4
buildroot/configs/vanilla_nx_defconfig → buildroot/configs/vanilla_nintendoswitch_defconfig
View File
File renamed without changes.
docker/README.md
+2 -2
View File
@@ -4,10 +4,10 @@ Since Vanilla's infrastructure can be somewhat complicated (and to aid in auto-b
Usage is as follows for all platforms:
- First, build the Docker image. We give it the tag `vanilla-build:latest` but you can choose anything.
- First, build the Docker image. We give it the tag `vanilla-build:latest` but you can choose anything. Vanilla's Dockerfiles are designed to be run from the context of the source code root, so `cd` there and type the following command:
```
docker build -t vanilla-build:latest .
docker build -f docker/<platform>/Dockerfile -t vanilla-build:latest .
```
- Secondly, use the new Docker image to build. Two volumes must be mounted, `/vanilla` for the source directory, and `/install` for the final compiled file structure. The following paths (`~/vanilla-src` and `~/vanilla-build`) are provided as an example, but you should select paths that make the most sense on your system.
docker/android/build.sh
+1 -10
View File
@@ -2,13 +2,4 @@
set -e
cd /vanilla/android
./gradlew -PbuildDir=/build assembleRelease
zipalign -v -p 4 /build/outputs/apk/release/app-release-unsigned.apk /build/outputs/apk/release/app-release-unsigned-aligned.apk
# If signing key is available, sign the APK
if [ -n "$ANDROID_SIGNING_KEY" ]
then
apksigner sign --ks /vanilla/docker/android/vanilla.jks --out /install/app-release.apk --ks-pass pass:$ANDROID_SIGNING_KEY /build/outputs/apk/release/app-release-unsigned-aligned.apk
else
# Otherwise, copy into the location expected by other scripts
cp /build/outputs/apk/release/app-release-unsigned-aligned.apk /install/app-release.apk
fi
zipalign -v -p 4 /build/outputs/apk/release/app-release-unsigned.apk /install/app-release.apk
docker/nintendoswitch/Dockerfile
+15
View File
@@ -46,4 +46,19 @@ RUN git clone --branch 2025.11-rc2 https://github.com/buildroot/buildroot.git /b
ENV FORCE_UNSAFE_CONFIGURE=1
# Patch Buildroot to build an older version of X11 because the Tegra BSP isn't compatible with the newer one
COPY buildroot/package/x11r7/* /buildroot/package/x11r7/xserver_xorg-server/
# Build everything except for Vanilla
COPY buildroot /vanilla/buildroot
RUN make -C /buildroot O=/build BR2_EXTERNAL=/vanilla/buildroot vanilla_nintendoswitch_defconfig && \
/buildroot/utils/config --file /build/.config -d BR2_PACKAGE_VANILLA && \
make -C /buildroot O=/build && \
/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA && \
/buildroot/utils/config --file /build/.config -d BR2_PACKAGE_VANILLA_USE_VAAPI && \
/buildroot/utils/config --file /build/.config -d BR2_PACKAGE_VANILLA_USE_DRM && \
/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA_USE_NX_IMU && \
/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA_USE_LOCAL && \
/buildroot/utils/config --file /build/.config --set-str BR2_PACKAGE_VANILLA_LOCAL_PATH /vanilla
ENTRYPOINT [ "/vanilla/docker/nintendoswitch/build.sh" ]
docker/nintendoswitch/build.sh
-6
View File
@@ -2,13 +2,7 @@
set -e
# Patch Buildroot to build an older version of X11 because the Tegra BSP isn't compatible with the newer one
cp /vanilla/buildroot/package/x11r7/* /buildroot/package/x11r7/xserver_xorg-server/
# Main build
make -C /buildroot O=/build BR2_EXTERNAL=/vanilla/buildroot vanilla_nx_defconfig
/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA_USE_LOCAL
/buildroot/utils/config --file /build/.config --set-str BR2_PACKAGE_VANILLA_LOCAL_PATH /vanilla
make -C /buildroot O=/build
# Copy initramfs
docker/raspberrypi0w/Dockerfile
+9
View File
@@ -38,4 +38,13 @@ RUN git clone --depth 1 --branch 2025.11-rc2 https://github.com/buildroot/buildr
ENV FORCE_UNSAFE_CONFIGURE=1
# Build everything except for Vanilla
COPY buildroot /vanilla/buildroot
RUN make -C /buildroot O=/build BR2_EXTERNAL=/vanilla/buildroot vanilla_raspberrypi0w_defconfig && \
/buildroot/utils/config --file /build/.config -d BR2_PACKAGE_VANILLA && \
make -C /buildroot O=/build && \
/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA && \
/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA_USE_LOCAL && \
/buildroot/utils/config --file /build/.config --set-str BR2_PACKAGE_VANILLA_LOCAL_PATH /vanilla
ENTRYPOINT [ "/vanilla/docker/raspberrypi0w/build.sh" ]
docker/raspberrypi0w/build.sh
-3
View File
@@ -2,9 +2,6 @@
set -e
make -C /buildroot O=/build BR2_EXTERNAL=/vanilla/buildroot vanilla_raspberrypi0w_defconfig
/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA_USE_LOCAL
/buildroot/utils/config --file /build/.config --set-str BR2_PACKAGE_VANILLA_LOCAL_PATH /vanilla
make -C /buildroot O=/build
cd /build/images
docker/raspberrypizero2w/Dockerfile
+9
View File
@@ -38,4 +38,13 @@ RUN git clone --depth 1 --branch 2025.11-rc2 https://github.com/buildroot/buildr
ENV FORCE_UNSAFE_CONFIGURE=1
# Build everything except for Vanilla
COPY buildroot /vanilla/buildroot
RUN make -C /buildroot O=/build BR2_EXTERNAL=/vanilla/buildroot vanilla_raspberrypizero2w_64_defconfig && \
/buildroot/utils/config --file /build/.config -d BR2_PACKAGE_VANILLA && \
make -C /buildroot O=/build && \
/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA && \
/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA_USE_LOCAL && \
/buildroot/utils/config --file /build/.config --set-str BR2_PACKAGE_VANILLA_LOCAL_PATH /vanilla
ENTRYPOINT [ "/vanilla/docker/raspberrypizero2w/build.sh" ]
docker/raspberrypizero2w/build.sh
-3
View File
@@ -2,9 +2,6 @@
set -e
make -C /buildroot O=/build BR2_EXTERNAL=/vanilla/buildroot vanilla_raspberrypizero2w_64_defconfig
/buildroot/utils/config --file /build/.config -e BR2_PACKAGE_VANILLA_USE_LOCAL
/buildroot/utils/config --file /build/.config --set-str BR2_PACKAGE_VANILLA_LOCAL_PATH /vanilla
make -C /buildroot O=/build
cd /build/images
docker/windows/Dockerfile
+1 -1
View File
@@ -15,6 +15,6 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VER/cmake-$C
&& chmod +x cmake-$CMAKE_VER-linux-$(uname -m).sh \
&& ./cmake-$CMAKE_VER-linux-$(uname -m).sh --prefix=/usr --skip-license
COPY "mingw-w64-x86_64.cmake" "/"
COPY "docker/windows/mingw-w64-x86_64.cmake" "/"
ENTRYPOINT [ "/vanilla/docker/windows/build.sh" ]