Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: add Apple silicon build #4747

Merged
merged 1 commit into from
Jun 7, 2024
Merged

ci: add Apple silicon build #4747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/manual-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,20 @@ jobs:
artifact: osx-tiles-x64
ext: dmg
content: application/x-apple-diskimage
- name: osx-curses-arm
os: macos-14
mxe: none
tiles: 0
artifact: osx-curses-arm
ext: dmg
content: application/x-apple-diskimage
- name: osx-tiles-arm
os: macos-14
mxe: none
tiles: 1
artifact: osx-tiles-arm
ext: dmg
content: application/x-apple-diskimage
- name: Android x64
os: ubuntu-22.04
mxe: none
Expand Down Expand Up @@ -224,6 +238,8 @@ jobs:
if: runner.os == 'macOS'
run: |
HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel
python3 -m venv ./venv
source ./venv/bin/activate
pip3 install mac_alias==2.2.0 dmgbuild==1.6.1 biplist

- name: Build CBN (linux)
Expand All @@ -249,6 +265,7 @@ jobs:
- name: Build CBN (osx)
if: runner.os == 'macOS'
run: |
source ./venv/bin/activate
make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} LUA=1 RELEASE=1 LANGUAGES=all USE_HOME_DIR=1 OSX_MIN=11 PCH=0 dmgdist COMPILER=clang++
mv CataclysmBN-${{ env.VERSION }}.dmg cbn-${{ matrix.artifact }}-${{ env.VERSION }}.dmg
- name: Set up JDK 11 (android)
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,20 @@ jobs:
artifact: osx-tiles-x64
ext: dmg
content: application/x-apple-diskimage
- name: osx-curses-arm
os: macos-14
mxe: none
tiles: 0
artifact: osx-curses-arm
ext: dmg
content: application/x-apple-diskimage
- name: osx-tiles-arm
os: macos-14
mxe: none
tiles: 1
artifact: osx-tiles-arm
ext: dmg
content: application/x-apple-diskimage
- name: Android x64
os: ubuntu-22.04
mxe: none
Expand Down Expand Up @@ -250,6 +264,8 @@ jobs:
if: runner.os == 'macOS'
run: |
HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel
python3 -m venv ./venv
source ./venv/bin/activate
pip3 install mac_alias==2.2.0 dmgbuild==1.6.1 biplist

- name: Build CBN (linux)
Expand Down Expand Up @@ -278,6 +294,7 @@ jobs:
- name: Build CBN (osx)
if: runner.os == 'macOS'
run: |
source ./venv/bin/activate
make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} LUA=1 RELEASE=1 LANGUAGES=all USE_HOME_DIR=1 OSX_MIN=11 PCH=0 dmgdist COMPILER=clang++
mv CataclysmBN-unstable.dmg cbn-${{ matrix.artifact }}-${{ needs.metadata.outputs.tag_name }}.dmg

Expand Down
2 changes: 2 additions & 0 deletions tools/copy_mac_libs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ def copy_and_rewrite(file):
if not os.path.isfile(file):
# raise Exception("{} is not a file.".format(executable))
return []
if os.path.exists(executable_dir + "/" + os.path.basename(file)):
return []
otool_ret = subprocess.run(["otool", "-L", file], capture_output=True)
if otool_ret.returncode != 0:
raise Exception("An error occured in calling otool -L:\n {}"
Expand Down
Loading