From 9f310c6cc8c74cfddd217c52c366e334abeed6ac Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Wed, 1 May 2024 22:37:22 +0200 Subject: [PATCH] Add MacOS arm support --- .github/workflows/compilation.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 88a144e..c75232b 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [[alpine, bash], [fedora, bash]] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies Alpine if: matrix.os[0] == 'alpine' @@ -36,13 +36,18 @@ jobs: runs-on: ${{ matrix.os[0] }} strategy: matrix: - os: [[macos-latest, bash], [macos-11, bash], [ubuntu-latest, bash]] + os: [ + [macos-latest, bash], + [macos-13, bash], + [ubuntu-latest, bash], + [windows-latest, msys2] + ] defaults: run: - shell: ${{ matrix.os[1] }} {0} + shell: ${{ matrix.os[2] }} {0} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install on Ubuntu if: matrix.os[0] == 'ubuntu-latest' @@ -59,8 +64,8 @@ jobs: - name: Compile Tools run: | - export PATH="/usr/local/opt/libtool/libexec/gnubin:$PATH" - export PKG_CONFIG_PATH="/usr/local/opt/libarchive/lib/pkgconfig:/usr/local/opt/openssl@3/lib/pkgconfig" + export PATH="$(brew --prefix libtool)/libexec/gnubin:$PATH" + export PKG_CONFIG_PATH="$(brew --prefix libarchive)/lib/pkgconfig:$(brew --prefix openssl@3)/lib/pkgconfig" export PSPDEV=$PWD/pspdev export PATH=$PATH:$PSPDEV/bin ./build-all.sh