Skip to content

Commit b3b4a4f

Browse files
felias-fogggatk555
authored andcommitted
changed rule for Mac and added Apple Silicon variant
1 parent e77a8b6 commit b3b4a4f

File tree

1 file changed

+30
-3
lines changed

1 file changed

+30
-3
lines changed

.github/workflows/build.yml

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Build Binaries
2-
on: [push, pull_request]
2+
on: [push, pull_request, workflow_dispatch]
33

44
jobs:
55
build-win64:
@@ -199,8 +199,8 @@ jobs:
199199
name: Linux AArch64
200200
path: simavr.tar.gz
201201
build-darwin-x64:
202-
# this is currently macos-11, Big Sur
203-
runs-on: macos-latest
202+
# macos-latest is an ARM architecture runner, you need to use the suffix -intel
203+
runs-on: macos-15-intel
204204
steps:
205205
- uses: actions/checkout@v4
206206
- name: Install Dependenncies
@@ -226,3 +226,30 @@ jobs:
226226
with:
227227
name: Mac OS Intel 64-bit
228228
path: simavr.tar.gz
229+
build-darwin-arm64:
230+
runs-on: macos-15
231+
steps:
232+
- uses: actions/checkout@v4
233+
- name: Install Dependenncies
234+
run: |
235+
HOMEBREW_NO_INSTALL_FROM_API=1 brew install make libelf freeglut patchelf
236+
HOMEBREW_NO_INSTALL_FROM_API=1 brew tap osx-cross/avr
237+
HOMEBREW_NO_INSTALL_FROM_API=1 brew install avr-gcc@9 avr-binutils
238+
export PATH="/usr/local/opt/avr-gcc@9/bin:$PATH"
239+
- name: CI-Build
240+
run: |
241+
avr-gcc --version || true
242+
clang --version
243+
export CFLAGS="-DGL_SILENCE_DEPRECATION"
244+
make -j4 build-simavr V=1 RELEASE=1
245+
mkdir simavr_installed
246+
make -k -j4 install RELEASE=1 DESTDIR=$(pwd)/simavr_installed/ || true
247+
file simavr_installed/bin/*
248+
otool -L simavr_installed/bin/*
249+
simavr_installed/bin/simavr --list-cores || true
250+
- name: Tar files
251+
run: tar -cvf simavr.tar.gz -C simavr_installed .
252+
- uses: actions/upload-artifact@v4
253+
with:
254+
name: Mac OS ARM 64-bit
255+
path: simavr.tar.gz

0 commit comments

Comments
 (0)