TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-08-04 02:06:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: tag build artifacts correctly

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2025-04-02 20:12:42 +02:00
parent 0cacfc576f
commit 0b51ac2bb4
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.docker/build-linux.sh
View File

@ -196,8 +196,12 @@ fi
CMAKE_ARGS="${CMAKE_ARGS} -DDWARFS_ARTIFACTS_DIR=/artifacts" CMAKE_ARGS="${CMAKE_ARGS} -DDWARFS_ARTIFACTS_DIR=/artifacts"
if [[ "$BUILD_DIST" == "alpine" ]]; then if [[ "$BUILD_DIST" == "alpine" ]]; then
if [[ "-$BUILD_TYPE-" == *-lto-* ]]; then
CMAKE_ARGS="${CMAKE_ARGS} -DDWARFS_ARTIFACT_SUFFIX=-musl-lto"
else
CMAKE_ARGS="${CMAKE_ARGS} -DDWARFS_ARTIFACT_SUFFIX=-musl" CMAKE_ARGS="${CMAKE_ARGS} -DDWARFS_ARTIFACT_SUFFIX=-musl"
fi fi
fi
if [[ "-$BUILD_TYPE-" == *-shared-* ]]; then if [[ "-$BUILD_TYPE-" == *-shared-* ]]; then
CMAKE_ARGS="${CMAKE_ARGS} -DBUILD_SHARED_LIBS=1 -DCMAKE_POSITION_INDEPENDENT_CODE=1" CMAKE_ARGS="${CMAKE_ARGS} -DBUILD_SHARED_LIBS=1 -DCMAKE_POSITION_INDEPENDENT_CODE=1"

11
CMakeLists.txt
View File

@ -990,6 +990,8 @@ if(DWARFS_OPTIMIZE)
endif() endif()
if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
set(DWARFS_ARTIFACT_ID "${DWARFS_ARTIFACT_ID}-reldbg") set(DWARFS_ARTIFACT_ID "${DWARFS_ARTIFACT_ID}-reldbg")
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
set(DWARFS_ARTIFACT_ID "${DWARFS_ARTIFACT_ID}-minsize")
elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(DWARFS_ARTIFACT_ID "${DWARFS_ARTIFACT_ID}-debug") set(DWARFS_ARTIFACT_ID "${DWARFS_ARTIFACT_ID}-debug")
endif() endif()
@ -1036,7 +1038,8 @@ if(STATIC_BUILD_DO_NOT_USE OR WIN32)
) )
endif() endif()
list(APPEND UNIVERSAL_UPX_TARGETS ${UNIVERSAL_OUT}) list(APPEND UNIVERSAL_UPX_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/${UNIVERSAL_OUT})
set(UNIVERSAL_ENV_LIST "${UNIVERSAL_ENV_LIST}${tgt}_binary=${UNIVERSAL_OUT}\n")
endforeach() endforeach()
add_custom_target(universal_upx DEPENDS ${UNIVERSAL_UPX_TARGETS}) add_custom_target(universal_upx DEPENDS ${UNIVERSAL_UPX_TARGETS})
@ -1076,13 +1079,13 @@ if(DEFINED ENV{GITHUB_REF_TYPE})
if(STATIC_BUILD_DO_NOT_USE OR WIN32) if(STATIC_BUILD_DO_NOT_USE OR WIN32)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/artifacts.env" file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/artifacts.env"
"binary_tarball=${CMAKE_PROJECT_NAME}-${DWARFS_ARTIFACT_ID}${PACKAGE_EXT}\n" "binary_tarball=${CMAKE_PROJECT_NAME}-${DWARFS_ARTIFACT_ID}${PACKAGE_EXT}\n"
"universal_binary=${UNIVERSAL_OUT}\n") "${UNIVERSAL_ENV_LIST}")
add_custom_command( add_custom_command(
OUTPUT _copy_artifacts OUTPUT _copy_artifacts
COMMAND ${CMAKE_COMMAND} -E make_directory ${ARTIFACTS_FULL_PATH} COMMAND ${CMAKE_COMMAND} -E make_directory ${ARTIFACTS_FULL_PATH}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${DWARFS_ARTIFACT_ID}${PACKAGE_EXT} ${ARTIFACTS_FULL_PATH} COMMAND ${CMAKE_COMMAND} -E copy -t ${ARTIFACTS_FULL_PATH} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${DWARFS_ARTIFACT_ID}${PACKAGE_EXT}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${UNIVERSAL_OUT} ${ARTIFACTS_FULL_PATH} COMMAND ${CMAKE_COMMAND} -E copy -t ${ARTIFACTS_FULL_PATH} ${UNIVERSAL_UPX_TARGETS}
) )
if(WITH_BENCHMARKS) if(WITH_BENCHMARKS)