Skip to content

Commit

Permalink
ci: Fix cross-platform build and change cpack artifact path
Browse files Browse the repository at this point in the history
Signed-off-by: Siddharth Chandrasekaran <[email protected]>
  • Loading branch information
sidcha committed Mar 21, 2024
1 parent 8b4c281 commit d7cd1c7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/cross-plaform-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,15 @@ jobs:
submodules: recursive
- name: Configure
run: |
cmake -DCMAKE_BUILD_TYPE=Debug .
cmake -B build -DCMAKE_BUILD_TYPE=Debug -DCONFIG_OSDP_LIB_ONLY=on .
- name: Build
run: cmake --build . --parallel 8
run: cmake --build build --parallel 8
- name: Pack built binaries
run: |
cmake --build . -t package
cmake --build . -t package_source
rm -rf ./packages/_CPack_Packages/
rm -f ./packages/*.tar.bz2
cmake --build build -t package
cmake --build build -t package_source
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: libosdp-${{ matrix.os }}-binaries.zip
path: ./packages/
path: build/artifacts/
9 changes: 5 additions & 4 deletions cmake/CreatePackages.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${CPACK_RESOURCE_FILE_README})
set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/packages")
SET(CPACK_OUTPUT_FILE_PREFIX "artifacts")

# Version
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
Expand All @@ -22,8 +23,8 @@ set(PACKAGE_NAME ${PROJECT_NAME}-${PROJECT_VERSION})
set(SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR})

# Source tarballs
set(CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME})
set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE_NAME}.src")
set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_IGNORE_FILES
/.git/
/.github/
Expand All @@ -32,8 +33,8 @@ set(CPACK_SOURCE_IGNORE_FILES
)

# Binaries
set(CPACK_GENERATOR "TGZ;TBZ2")
set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${SYSTEM_NAME})
set(CPACK_GENERATOR "TGZ")
set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${SYSTEM_NAME}")
include(CPackComponent)
cpack_add_component(distributables
DISPLAY_NAME ${PROJECT_NAME}
Expand Down

0 comments on commit d7cd1c7

Please sign in to comment.