From 5832531d20887f512f845c8a78133fb2ba1a0641 Mon Sep 17 00:00:00 2001 From: zrgt Date: Fri, 12 Apr 2024 14:59:25 +0200 Subject: [PATCH] Add builds for macOS M1 and x86 --- .github/workflows/release_on_master_push.yaml | 15 ++++++++++++--- .github/workflows/release_on_tag_push.yaml | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release_on_master_push.yaml b/.github/workflows/release_on_master_push.yaml index 7999be2..f77e8a0 100644 --- a/.github/workflows/release_on_master_push.yaml +++ b/.github/workflows/release_on_master_push.yaml @@ -35,14 +35,23 @@ jobs: strategy: matrix: include: - - os: macos-latest + - os: macos-14 TARGET: macos CMD_BUILD: > pyinstaller aas_manager.spec && cp -r basyx dist/AAS_Manager/basyx && cd dist/ && - zip -r AAS_Manager_MacOS.zip AAS_Manager - OUT_FILE_NAME: AAS_Manager_MacOS.zip + zip -r AAS_Manager_MacOS_M1.zip AAS_Manager + OUT_FILE_NAME: AAS_Manager_MacOS_M1.zip + ASSET_MIME: application/zip + - os: macos-12 + TARGET: macos + CMD_BUILD: > + pyinstaller aas_manager.spec && + cp -r basyx dist/AAS_Manager/basyx && + cd dist/ && + zip -r AAS_Manager_MacOS_x86.zip AAS_Manager + OUT_FILE_NAME: AAS_Manager_MacOS_x86.zip ASSET_MIME: application/zip - os: ubuntu-latest TARGET: ubuntu diff --git a/.github/workflows/release_on_tag_push.yaml b/.github/workflows/release_on_tag_push.yaml index 458e881..8e77a0f 100644 --- a/.github/workflows/release_on_tag_push.yaml +++ b/.github/workflows/release_on_tag_push.yaml @@ -36,14 +36,23 @@ jobs: strategy: matrix: include: - - os: macos-latest + - os: macos-14 TARGET: macos CMD_BUILD: > pyinstaller aas_manager.spec && cp -r basyx dist/AAS_Manager/basyx && cd dist/ && - zip -r AAS_Manager_MacOS.zip AAS_Manager - OUT_FILE_NAME: AAS_Manager_MacOS.zip + zip -r AAS_Manager_MacOS_M1.zip AAS_Manager + OUT_FILE_NAME: AAS_Manager_MacOS_M1.zip + ASSET_MIME: application/zip + - os: macos-12 + TARGET: macos + CMD_BUILD: > + pyinstaller aas_manager.spec && + cp -r basyx dist/AAS_Manager/basyx && + cd dist/ && + zip -r AAS_Manager_MacOS_x86.zip AAS_Manager + OUT_FILE_NAME: AAS_Manager_MacOS_x86.zip ASSET_MIME: application/zip - os: ubuntu-latest TARGET: ubuntu