From 7e2bbbb9acb2b6d602a640c5ccfef305b2f6c172 Mon Sep 17 00:00:00 2001
From: bladeoner <bladeoner112@gmail.com>
Date: Tue, 21 Jul 2020 23:10:14 +0200
Subject: [PATCH] Fix CI/CD build and adjust Credits (#939)

- Remove Cirrus CI build
- Add Github Workflow
- Adjust README.md
- Adjust Credits
---
 .cirrus.yml                                   | 17 -----------
 .../continuous-integration-workflow.yml       | 30 +++++++++++++++++++
 README.md                                     | 12 ++++----
 source/menu.cpp                               |  2 +-
 4 files changed, 37 insertions(+), 24 deletions(-)
 delete mode 100644 .cirrus.yml
 create mode 100644 .github/workflows/continuous-integration-workflow.yml

diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 5e79e1b..0000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-snes9xgx_gamecube-wii_task:
-  container:
-    image: devkitpro/devkitppc
-  
-  update_script:
-    - sudo dkp-pacman -Sy --noconfirm
-    - sudo dkp-pacman -Syu --noconfirm
-  
-  setup_script:
-    - cp -r /tmp/cirrus-ci-build/buildtools/libfreetype.a /opt/devkitpro/portlibs/ppc/lib/
-    - cp -r /tmp/cirrus-ci-build/buildtools/libfreetype.la /opt/devkitpro/portlibs/ppc/lib/
-  
-  compile_script:
-    - make -j3
-  
-  build_artifacts:
-    path: "executables/*"
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
new file mode 100644
index 0000000..d2cd298
--- /dev/null
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -0,0 +1,30 @@
+name: Snes9x GX Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: ubuntu-20.04
+    runs-on: ubuntu-20.04
+    container: devkitpro/devkitppc:latest
+ 
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: true
+
+    - name: Copy build files
+      run: |
+        cp -r libfreetype.a /opt/devkitpro/portlibs/ppc/lib/
+        cp -r libfreetype.la /opt/devkitpro/portlibs/ppc/lib/
+      working-directory: ./buildtools
+
+    - name: Build
+      run: |
+        make -j2
+
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v2
+      with: 
+        name: executables
+        path: executables/*
diff --git a/README.md b/README.md
index 51a33c0..a41e976 100644
--- a/README.md
+++ b/README.md
@@ -10,11 +10,11 @@ Wii homebrew is WiiBrew (www.wiibrew.org).
 
 ## Nightly builds
 
-|Download nightly builds from continuous integration: 	| [![Build Status][snes9xgx_gamecube-wii]][cirrus-ci] 
+|Download nightly builds from continuous integration: 	| [![Build Status][Build]][Actions] 
 |-------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|
 
-[cirrus-ci]: https://cirrus-ci.com/github/dborth/snes9xgx
-[snes9xgx_gamecube-wii]: https://api.cirrus-ci.com/github/dborth/snes9xgx.svg?task=snes9xgx_gamecube-wii
+[Actions]: https://github.com/dborth/snes9xgx/actions
+[Build]: https://github.com/dborth/snes9xgx/workflows/Snes9x%20GX%20Build/badge.svg
 
 
 ## FEATURES
@@ -988,14 +988,14 @@ changes to the emulator settings again and save them.
                       Additional coding                           michniewski
                       Menu artwork                              the3seashells
                       Menu sound                                 Peter de Man
-                      Extra coding                      Zopenko,Burnt Lasagna
-                                                        Askot
+                      Extra coding                     Zopenko, Burnt Lasagna,
+                                                         Askot, bladeoner
 
                       Snes9x GX GameCube                    SoftDev, crunchy2,
                                                             eke-eke, others
 
                       Snes9x                                      Snes9x Team
-                      libogc/devkitPPC                   shagkur & wintermute
+                      libogc/devkitPPC                   shagkur & WinterMute
                       FreeTypeGX                              Armin Tamzarian
 
 
diff --git a/source/menu.cpp b/source/menu.cpp
index c13d9ae..2b5a209 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -855,7 +855,7 @@ static void WindowCredits(void * ptr)
 
 	txt[i] = new GuiText("libogc / devkitPPC");
 	txt[i]->SetPosition(60,y); i++;
-	txt[i] = new GuiText("shagkur & wintermute");
+	txt[i] = new GuiText("shagkur & WinterMute");
 	txt[i]->SetPosition(350,y); i++; y+=24;
 	txt[i] = new GuiText("FreeTypeGX");
 	txt[i]->SetPosition(60,y); i++;