Fix CI/CD build and adjust Credits (#939)

- Remove Cirrus CI build
- Add Github Workflow
- Adjust README.md
- Adjust Credits
This commit is contained in:
bladeoner 2020-07-21 23:10:14 +02:00 committed by GitHub
parent a13c3ab0a0
commit 7e2bbbb9ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 24 deletions

View File

@ -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/*"

View File

@ -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/*

View File

@ -10,11 +10,11 @@ Wii homebrew is WiiBrew (www.wiibrew.org).
## Nightly builds ## 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 [Actions]: https://github.com/dborth/snes9xgx/actions
[snes9xgx_gamecube-wii]: https://api.cirrus-ci.com/github/dborth/snes9xgx.svg?task=snes9xgx_gamecube-wii [Build]: https://github.com/dborth/snes9xgx/workflows/Snes9x%20GX%20Build/badge.svg
## FEATURES ## FEATURES
@ -988,14 +988,14 @@ changes to the emulator settings again and save them.
Additional coding michniewski Additional coding michniewski
Menu artwork the3seashells Menu artwork the3seashells
Menu sound Peter de Man Menu sound Peter de Man
Extra coding Zopenko,Burnt Lasagna Extra coding Zopenko, Burnt Lasagna,
Askot Askot, bladeoner
Snes9x GX GameCube SoftDev, crunchy2, Snes9x GX GameCube SoftDev, crunchy2,
eke-eke, others eke-eke, others
Snes9x Snes9x Team Snes9x Snes9x Team
libogc/devkitPPC shagkur & wintermute libogc/devkitPPC shagkur & WinterMute
FreeTypeGX Armin Tamzarian FreeTypeGX Armin Tamzarian

View File

@ -855,7 +855,7 @@ static void WindowCredits(void * ptr)
txt[i] = new GuiText("libogc / devkitPPC"); txt[i] = new GuiText("libogc / devkitPPC");
txt[i]->SetPosition(60,y); i++; 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]->SetPosition(350,y); i++; y+=24;
txt[i] = new GuiText("FreeTypeGX"); txt[i] = new GuiText("FreeTypeGX");
txt[i]->SetPosition(60,y); i++; txt[i]->SetPosition(60,y); i++;