From 648962858f23915a36bd9376da53674966db9d73 Mon Sep 17 00:00:00 2001 From: bladeoner Date: Tue, 21 Jul 2020 23:11:31 +0200 Subject: [PATCH] Fix CI/CD build and adjust Credits (#407) - Remove Cirrus CI build - Add Github Workflow - Adjust README.md - Adjust Credits --- .cirrus.yml | 17 ----------- .../continuous-integration-workflow.yml | 30 +++++++++++++++++++ README.md | 6 ++-- source/menu.cpp | 2 +- 4 files changed, 34 insertions(+), 21 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 f42eb7a..0000000 --- a/.cirrus.yml +++ /dev/null @@ -1,17 +0,0 @@ -vbagx_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..7e626d1 --- /dev/null +++ b/.github/workflows/continuous-integration-workflow.yml @@ -0,0 +1,30 @@ +name: Visual Boy Advance GX + +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 f49711e..835693b 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ With it you can play GBA/Game Boy Color/Game Boy games on your Wii/GameCube. ## Nightly builds -|Download nightly builds from continuous integration: | [![Build Status][vbagx_gamecube-wii]][cirrus-ci] +|Download nightly builds from continuous integration: | [![Build Status][Build]][Actions] |-------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------| -[cirrus-ci]: https://cirrus-ci.com/github/dborth/vbagx -[vbagx_gamecube-wii]: https://api.cirrus-ci.com/github/dborth/vbagx.svg?task=vbagx_gamecube-wii +[Actions]: https://github.com/dborth/vbagx/actions +[Build]: https://github.com/dborth/vbagx/workflows/Visual%20Boy%20Advance%20GX%20Build/badge.svg ## FEATURES diff --git a/source/menu.cpp b/source/menu.cpp index 2c1032a..0baebb1 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -840,7 +840,7 @@ static void WindowCredits(void * ptr) txt[i] = new GuiText("libogc / devkitPPC"); txt[i]->SetPosition(40,y); i++; - txt[i] = new GuiText("shagkur & wintermute"); + txt[i] = new GuiText("shagkur & WinterMute"); txt[i]->SetPosition(250,y); i++; y+=24; txt[i] = new GuiText("FreeTypeGX"); txt[i]->SetPosition(40,y); i++;