Skip to content

Commit 9431fae

Browse files
committed
Add MacOS arm support
1 parent 2e45009 commit 9431fae

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

.github/workflows/compilation.yml

+15-10
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
os: [[alpine, bash], [fedora, bash]]
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818

1919
- name: Install dependencies Alpine
2020
if: matrix.os[0] == 'alpine'
@@ -36,31 +36,36 @@ jobs:
3636
runs-on: ${{ matrix.os[0] }}
3737
strategy:
3838
matrix:
39-
os: [[macos-latest, bash], [macos-11, bash], [ubuntu-latest, bash]]
39+
os: [
40+
[macos-latest, arm64, bash],
41+
[macos-13, x86_64, bash],
42+
[ubuntu-latest, x86_64, bash]
43+
]
44+
fail-fast: false
4045
defaults:
4146
run:
42-
shell: ${{ matrix.os[1] }} {0}
47+
shell: ${{ matrix.os[2] }} {0}
4348

4449
steps:
45-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
4651

4752
- name: Install on Ubuntu
4853
if: matrix.os[0] == 'ubuntu-latest'
4954
run: |
5055
sudo apt-get update
51-
sudo apt-get -y install libarchive-dev libcurl4 libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev
52-
echo "MSYSTEM=x64" >> $GITHUB_ENV
56+
sudo apt-get -y install libcurl4 libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev
5357
5458
- name: Install Dependencies Mac
5559
if: startsWith( matrix.os[0], 'macos' )
5660
run: |
57-
brew install automake libarchive bash openssl libarchive gpgme libtool
58-
echo "MSYSTEM=x64" >> $GITHUB_ENV
61+
brew update
62+
brew install automake bash openssl libarchive gpgme libtool
63+
brew reinstall openssl@3 # https://github.com/Homebrew/homebrew-core/issues/169728#issuecomment-2074958306
5964
6065
- name: Compile Tools
6166
run: |
62-
export PATH="/usr/local/opt/libtool/libexec/gnubin:$PATH"
63-
export PKG_CONFIG_PATH="/usr/local/opt/libarchive/lib/pkgconfig:/usr/local/opt/openssl@3/lib/pkgconfig"
67+
export PATH="$(brew --prefix libtool)/libexec/gnubin:$PATH"
68+
export PKG_CONFIG_PATH="$(brew --prefix libarchive)/lib/pkgconfig:$(brew --prefix openssl@3)/lib/pkgconfig"
6469
export PSPDEV=$PWD/pspdev
6570
export PATH=$PATH:$PSPDEV/bin
6671
./build-all.sh

depends/check-dependencies.sh

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ header_paths=(
66
"/usr/local/opt/" \
77
"/opt/include" \
88
"/opt/local/include" \
9+
"/opt/homebrew/opt/"
910
"/usr/include/$(uname -m)-linux-gnu" \
1011
"/usr/local/include/$(uname -m)-linux-gnu" \
1112
"/usr/include/i386-linux-gnu" \

0 commit comments

Comments
 (0)