From dfce0c4601b25e54e00bd54655b56c0e29400cba Mon Sep 17 00:00:00 2001 From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:11:20 +0200 Subject: [PATCH] Update Dockerfile and workflow --- .github/workflows/build.yml | 6 +++--- Dockerfile | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38db588..db8d13a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,13 +4,13 @@ on: [push, pull_request] jobs: build-binary: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build binary run: | docker run --rm -v ${PWD}:/project garyodernichts/wiiuident_builder make - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: WiiUIdent path: | diff --git a/Dockerfile b/Dockerfile index 2ba1a41..f53fe2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,17 @@ -FROM ghcr.io/wiiu-env/devkitppc:20230417 +FROM ghcr.io/wiiu-env/devkitppc:20231112 -COPY --from=ghcr.io/wiiu-env/libmocha:20230417 /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/libmocha:20231127 /artifacts $DEVKITPRO + +# Build latest wut +RUN \ +mkdir wut && \ +cd wut && \ +git init . && \ +git remote add origin https://github.com/devkitPro/wut.git && \ +git fetch --depth 1 origin 682f8eb48a79796e653eb711c001ba47355f351c && \ +git checkout FETCH_HEAD +WORKDIR /wut +RUN make -j$(nproc) +RUN make install WORKDIR /project