From 1d1ab97e7c72dea6cb0062067bee3558bcfb8506 Mon Sep 17 00:00:00 2001
From: Fledge68 <fledge68@gmail.com>
Date: Mon, 6 Sep 2021 15:30:37 -0500
Subject: [PATCH] - try to fix build script

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 064322e0..135b1219 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
@@ -16,7 +16,7 @@ jobs:
           path: cache
           key: ${{ runner.os }}-cache-1
 
-      - name: Download devkitPPC r36, libogc 1.8.24, bin2s and elf2dol
+      - name: Download devkitPPC r39, libogc 2.3.1 and required tools
         if: steps.cache-1.outputs.cache-hit != 'true'
         # general-tools is needed for bin2s and gamecube-tools is needed for elf2dol
         run: | 
@@ -28,16 +28,14 @@ jobs:
           wget "https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz"
           cd ..
 
-      - name: Extract devkitPPC r36, libogc 1.8.24, bin2s and elf2dol
+      - name: Extract downloaded files
         # general-tools is needed for bin2s and gamecube-tools is needed for elf2dol
         run: | 
-          tar -xf cache/devkitPPC-r39-2-linux_x86_64.pkg.tar.xz opt/devkitpro/devkitPPC --strip-components=1
-          tar -xf cache/devkitppc-rules-1.1.1-1-any.pkg.tar.xz opt/devkitpro/devkitPPC --strip-components=1
-          tar -xf cache/libogc-2.3.1-1-any.pkg.tar.xz opt/devkitpro/libogc --strip-components=1
-          tar -xf cache/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz opt/devkitpro/tools/bin/bin2s --strip-components=4
-          sudo cp bin2s /usr/local/bin/bin2s
-          tar -xf cache/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz opt/devkitpro/tools/bin/elf2dol --strip-components=4
-          sudo cp elf2dol /usr/local/bin/elf2dol
+          tar -xf cache/devkitPPC-r39-2-linux_x86_64.pkg.tar.xz --strip-components=1
+          tar -xf cache/devkitppc-rules-1.1.1-1-any.pkg.tar.xz --strip-components=1
+          tar -xf cache/libogc-2.3.1-1-any.pkg.tar.xz --strip-components=1
+          tar -xf cache/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz --strip-components=1
+          tar -xf cache/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz --strip-components=1
 
       - name: Compile
         run: |