From 31c656803c84171150ad88d296021117f7c92238 Mon Sep 17 00:00:00 2001 From: Jason Watson Date: Wed, 23 Oct 2024 16:57:33 -0400 Subject: [PATCH] ci: use codesigning through makefile --- ci/build-slm.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/build-slm.sh b/ci/build-slm.sh index b28763b..8ebe107 100755 --- a/ci/build-slm.sh +++ b/ci/build-slm.sh @@ -78,7 +78,13 @@ esac cd "${REPODIR}" echo "Building slm version ${VER} in ${PWD}" -${MAKE} +CONAN_OPTS="-vtrace" +if [ "$SIGN_EXECUTABLE" == "true" ] ; then + CONAN_OPTS=" -o:h codesign=True ${CONAN_OPTS}" +fi +MAKEARGS=" CONAN_OPTS=\" ${CONAN_OPTS}\" " + +${MAKE} ${MAKEARGS} if [ "$CREATE_PACKAGE" == "true" ] ; then #VERU=${VER//./_} # convert dots to underscores @@ -102,10 +108,6 @@ if [ "$CREATE_PACKAGE" == "true" ] ; then cd ziptmp - if [ "$SIGN_EXECUTABLE" == "true" ] ; then - ../ci/sign-windows-release.bash - fi - zip -r ../slm-${PLATFORM_DESC}_${VER}.zip * fi