From 0551966b6e8a1c29918cb5294606de433e386830 Mon Sep 17 00:00:00 2001 From: Oliver Bell Date: Tue, 4 Feb 2025 23:43:25 +0000 Subject: [PATCH] add macos builds to CI --- .github/workflows/build.yml | 15 +++++++++++---- INSTALL.md | 5 +---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca506cc12..9f94eaf03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -107,13 +107,14 @@ jobs: add: "reports maps" message: ${{ env.REPORTS_COMMIT_MSG }} - platforms_linux: + ports: strategy: matrix: platform: ["sdl", "sdl_win32", "win32"] + os: ["ubuntu-22.04", "macos-15"] if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork || github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.fork}} - runs-on: ubuntu-22.04 - name: Linux build ${{ matrix.platform }} + runs-on: ${{ matrix.os }} + name: Build ${{ matrix.platform }} (${{ matrix.os }}) steps: - name: Checkout PR if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target'}} @@ -125,9 +126,15 @@ jobs: if: ${{ github.event_name == 'push' }} uses: actions/checkout@master - - name: Install tools + - name: Install tools (Linux) + if: ${{ matrix.os == 'ubuntu-22.04' }} run: | sudo apt update && sudo apt install xorg-dev libsdl2-dev gcc-mingw-w64 libarchive-tools + + - name: Install Tools (Macos) + if: ${{ matrix.os == 'macos-15' }} + run: | + brew install libpng sdl2 mingw-w64 arm-none-eabi-gcc - name: Install SDL for win32 if: ${{ matrix.platform == 'sdl_win32' }} diff --git a/INSTALL.md b/INSTALL.md index ffa359a46..405c6f2f1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -37,12 +37,9 @@ sudo apt install build-essential binutils-arm-none-eabi gcc-arm-none-eabi libpng ### On MacOS ``` -brew install libpng sdl2 mingw-w64 +brew install libpng sdl2 mingw-w64 arm-none-eabi-gcc ``` -Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM) (Skip if not building the GBA) - - ## Install `agbcc` into the repo (skip if not compiling for the GBA) Clone the [agbcc](https://github.com/SAT-R/agbcc) repo into another folder