Skip to content

Commit

Permalink
Improve MacOS release build
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
leonlynch committed Sep 14, 2023
1 parent 58d245c commit 6cc1b0c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/macos-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6cc1b0c

Please sign in to comment.