From 32d33b7b2c4460e6fb9696dc0ab55b26f254f033 Mon Sep 17 00:00:00 2001 From: Antoine Lambert Date: Tue, 9 Jan 2024 19:30:23 +0100 Subject: [PATCH] gha/macports: Add job to build Talipot on macOS arm64 --- .github/workflows/macos-macports-build.yml | 8 +++----- bundlers/mac/mac_bundle.sh.in | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos-macports-build.yml b/.github/workflows/macos-macports-build.yml index 584c0941a7..43b45f36bc 100644 --- a/.github/workflows/macos-macports-build.yml +++ b/.github/workflows/macos-macports-build.yml @@ -11,12 +11,10 @@ jobs: fail-fast: false matrix: config: - - name: Talipot build on macOS 11 + - name: Talipot build on macOS x86_64 os: macos-11 - - name: Talipot build on macOS 12 - os: macos-12 - - name: Talipot build on macOS 13 - os: macos-13 + - name: Talipot build on macOS arm64 + os: flyci-macos-large-latest-m1 steps: - name: Cancel Previous Runs uses: styfle/cancel-workflow-action@0.11.0 diff --git a/bundlers/mac/mac_bundle.sh.in b/bundlers/mac/mac_bundle.sh.in index 923eb1e772..6418332c6e 100755 --- a/bundlers/mac/mac_bundle.sh.in +++ b/bundlers/mac/mac_bundle.sh.in @@ -124,4 +124,5 @@ sh "${SRC_DIR}/make_dmg.sh" ${APP_NAME} "@TalipotVersion@" "${DEST_DIR}/applicat # rename dmg echo "${APP_NAME}-@TalipotVersion@-macOS-${MACOS_VERSION}.dmg has been successfully generated in ${DEST_DIR}" -mv ${APP_NAME}-@TalipotVersion@.dmg ${APP_NAME}-@TalipotVersion@-macOS-${MACOS_VERSION}.dmg +mv ${APP_NAME}-@TalipotVersion@.dmg \ + ${APP_NAME}-@TalipotVersion@-@CMAKE_HOST_SYSTEM_PROCESSOR@-macOS-${MACOS_VERSION}.dmg