From 6cc1b0cd5c39269c074c89e42ddf1b3044aa236e Mon Sep 17 00:00:00 2001 From: Leon Lynch Date: Thu, 14 Sep 2023 22:17:49 +0200 Subject: [PATCH] Improve MacOS release build * Let MacOS release build also provide a TGZ artifact. This matches the Windows release build and is useful for debugging packaging problems. * It is not necessary to build tr31-tool during the tr31 build of the MacOS release build --- .github/workflows/macos-build.yaml | 6 ++++-- CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-build.yaml b/.github/workflows/macos-build.yaml index 509ee23..7b939fa 100644 --- a/.github/workflows/macos-build.yaml +++ b/.github/workflows/macos-build.yaml @@ -102,7 +102,7 @@ jobs: gh release download --repo openemv/tr31 ${{ env.TR31_VERSION }} tar xvfz tr31-${{ env.TR31_VERSION }}-src.tar.gz cd tr31-${{ env.TR31_VERSION }} - cmake -B build -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DFETCH_MBEDTLS=YES -DFETCH_ARGP=YES + cmake -B build -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DFETCH_MBEDTLS=YES -DBUILD_TR31_TOOL=NO cmake --build build echo "TR31_DIR=$(pwd)/build/cmake/" >> $GITHUB_ENV cd .. @@ -136,5 +136,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: dukpt-${{ env.GIT_DESCRIBE }}-macos - path: build/dukpt-*.dmg + path: | + build/dukpt-*.tar.gz + build/dukpt-*.dmg if-no-files-found: error diff --git a/CMakeLists.txt b/CMakeLists.txt index d300afa..0b7ad13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,7 +327,7 @@ endif() # Generate DragNDrop package for MacOS if dukpt-ui is available if(APPLE AND TARGET dukpt-ui AND BUILD_MACOSX_BUNDLE) - set(CPACK_GENERATOR "DragNDrop") # Skip TGZ generator when building MacOS bundle + list(APPEND CPACK_GENERATOR "DragNDrop") # Only package dukpt-ui bundle (which includes ancillary files for MacOS) set(CPACK_COMPONENTS_ALL dukpt_ui_bundle) # Use dukpt-ui license file