From fb0eb005a72e3727b71068616f7436821950db5b Mon Sep 17 00:00:00 2001
From: wins1ey <wins1ey@wins1ey.win>
Date: Sat, 8 Nov 2025 00:35:17 +0000
Subject: [PATCH 1/3] Fix ci

---
 .github/workflows/ci.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5691807..011191b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,15 +3,17 @@ on: push
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: devkitpro/devkitppc:20231110
+    container: devkitpro/devkitppc:20250727
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup
         run: |
-          apt-get update && apt-get install -y genisoimage git golang nodejs build-essential gcc-arm-none-eabi python3-distutils python3-setuptools
-          curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py
-          pip3 install -r patches/scripts/requirements.txt
+          apt-get update && apt-get install -y genisoimage git golang nodejs build-essential gcc-arm-none-eabi python3-venv python3-distutils python3-setuptools
+          python3 -m venv venv
+          . ./venv/bin/activate
+          pip install --upgrade pip
+          pip install -r patches/scripts/requirements.txt
       - name: Build libogc2
         run: |
           git clone https://github.com/extremscorner/libogc2.git
@@ -21,7 +23,9 @@ jobs:
           git clone https://github.com/extremscorner/libfat.git
           (cd libfat; sed -i '/rice/d' Makefile; make ogc-install)
       - name: Build cubeboot
-        run: cd entry; make clean && make
+        run: |
+          . ./venv/bin/activate
+          cd entry; make clean && make
       # - name: Build apploader
       #   run: |
       #     git clone -b force-early-boot --single-branch https://github.com/OffBroadway/gc-boot-tools.git
@@ -46,7 +50,7 @@ jobs:
           mv ./cubeboot/cubeboot.dol dist/next/cubeboot.dol
           # mv ./PicoBoot/picoboot.uf2 dist/next/cubeboot.uf2
       - name: Archive
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist/next/

From bf0c97c193a5b52d774bda18d83fb18ff7fa7dd5 Mon Sep 17 00:00:00 2001
From: wins1ey <wins1ey@wins1ey.win>
Date: Sun, 9 Nov 2025 21:08:36 +0000
Subject: [PATCH 2/3] ci: use extremscorner/libogc2 instead of
 devkitpro/devkitppc

This means that libogc2 and libfat don't need to be build during the
action because they are included in the container.
---
 .github/workflows/ci.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 011191b..b26eee6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on: push
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: devkitpro/devkitppc:20250727
+    container: ghcr.io/extremscorner/libogc2:20251109
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -14,14 +14,6 @@ jobs:
           . ./venv/bin/activate
           pip install --upgrade pip
           pip install -r patches/scripts/requirements.txt
-      - name: Build libogc2
-        run: |
-          git clone https://github.com/extremscorner/libogc2.git
-          (cd libogc2; make install)
-      - name: Build libfat
-        run: |
-          git clone https://github.com/extremscorner/libfat.git
-          (cd libfat; sed -i '/rice/d' Makefile; make ogc-install)
       - name: Build cubeboot
         run: |
           . ./venv/bin/activate

From 07f04cabc2ef66085e21342a795117027b03e88e Mon Sep 17 00:00:00 2001
From: wins1ey <wins1ey@wins1ey.win>
Date: Sun, 9 Nov 2025 21:10:16 +0000
Subject: [PATCH 3/3] ci: install pyelftools with apt instead of pip

---
 .github/workflows/ci.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b26eee6..d002087 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,15 +9,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup
         run: |
-          apt-get update && apt-get install -y genisoimage git golang nodejs build-essential gcc-arm-none-eabi python3-venv python3-distutils python3-setuptools
-          python3 -m venv venv
-          . ./venv/bin/activate
-          pip install --upgrade pip
-          pip install -r patches/scripts/requirements.txt
+          apt-get update && apt-get install -y genisoimage git golang nodejs build-essential gcc-arm-none-eabi python3-pyelftools
       - name: Build cubeboot
-        run: |
-          . ./venv/bin/activate
-          cd entry; make clean && make
+        run: cd entry; make clean && make
       # - name: Build apploader
       #   run: |
       #     git clone -b force-early-boot --single-branch https://github.com/OffBroadway/gc-boot-tools.git