diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index 67bd4938486b..33d23419815f 100644 --- a/.github/workflows/manual-release.yml +++ b/.github/workflows/manual-release.yml @@ -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 @@ -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) @@ -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) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1bb04d1cfc8..c571c5b77c48 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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) @@ -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 diff --git a/tools/copy_mac_libs.py b/tools/copy_mac_libs.py index e10871f3f4fc..3db7ff131d8d 100644 --- a/tools/copy_mac_libs.py +++ b/tools/copy_mac_libs.py @@ -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 {}"