curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AUTH-2712 fixed the mac build script

This commit is contained in:
Dalton 2020-08-18 15:33:50 -05:00 committed by Dalton Cherry
parent 1a96889141
commit 310bd0dbf1
1 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
.teamcity/build-macos.sh vendored
View File

@ -29,74 +29,83 @@ cd ../src/github.com/cloudflare/cloudflared
GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared
# Add code signing private key to the key chain
if [[ -z "${CFD_CODE_SIGN_KEY}" ]]; then
if [[ -n "${CFD_CODE_SIGN_KEY:-}" ]]; then
if [[ -n "${CFD_CODE_SIGN_PASS:-}" ]]; then
# write private key to disk and then import it keychain
echo -n -e ${CFD_CODE_SIGN_KEY} | base64 -D > ${CODE_SIGN_PRIV}
security import ${CODE_SIGN_PRIV} -A -P "${CFD_CODE_SIGN_PASS}"
rm ${CODE_SIGN_PRIV}
else
exit 1
fi
fi
# Add code signing certificate to the key chain
if [[ -z "${CFD_CODE_SIGN_CERT}" ]]; then
if [[ -n "${CFD_CODE_SIGN_CERT:-}" ]]; then
# write certificate to disk and then import it keychain
echo -n -e ${CFD_CODE_SIGN_CERT} | base64 -D > ${CODE_SIGN_CERT}
security import ${CODE_SIGN_CERT}
rm ${CODE_SIGN_CERT}
else
exit 1
fi
# Add package signing private key to the key chain
if [[ -z "${CFD_INSTALLER_KEY}" ]]; then
if [[ -n "${CFD_INSTALLER_KEY:-}" ]]; then
if [[ -n "${CFD_INSTALLER_PASS:-}" ]]; then
# write private key to disk and then import it into the keychain
echo -n -e ${CFD_INSTALLER_KEY} | base64 -D > ${INSTALLER_PRIV}
security import ${INSTALLER_PRIV} -A -P "${CFD_INSTALLER_PASS}"
rm ${INSTALLER_PRIV}
else
exit 1
fi
fi
# Add package signing certificate to the key chain
if [[ -z "${CFD_INSTALLER_CERT}" ]]; then
if [[ -n "${CFD_INSTALLER_CERT:-}" ]]; then
# write certificate to disk and then import it keychain
echo -n -e ${CFD_INSTALLER_CERT} | base64 -D > ${INSTALLER_CERT}
security import ${INSTALLER_CERT}
rm ${INSTALLER_CERT}
else
exit 1
fi
# get the code signing certificate name
if [[ -z "${CFD_CODE_SIGN_NAME}" ]]; then
CODE_SIGN_NAME=$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Application:")
else
if [[ -n "${CFD_CODE_SIGN_NAME:-}" ]]; then
CODE_SIGN_NAME="${CFD_CODE_SIGN_NAME}"
else
if [[ -n "$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Application:")" ]]; then
CODE_SIGN_NAME=$(echo "something else" | grep "Developer ID Application:")
else
CODE_SIGN_NAME=""
fi
fi
# get the package signing certificate name
if [[ -z "${CFD_INSTALLER_NAME}" ]]; then
if [[ -n "${CFD_INSTALLER_NAME:-}" ]]; then
PKG_SIGN_NAME="${CFD_INSTALLER_NAME}"
else
if [[ -n "$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Installer:")" ]]; then
PKG_SIGN_NAME=$(security find-identity -v | cut -d'"' -f 2 -s | grep "Developer ID Installer:")
else
PKG_SIGN_NAME="${CFD_INSTALLER_NAME}"
PKG_SIGN_NAME=""
fi
fi
# sign the cloudflared binary
if [[ -n "${CODE_SIGN_NAME:-}" ]]; then
codesign -s "${CODE_SIGN_NAME}" -f -v --timestamp --options runtime ${BINARY_NAME}
fi
# creating build directory
mkdir ${TARGET_DIRECTORY}
mkdir ${TARGET_DIRECTORY}/contents
cp -r .mac_resources/scripts ${TARGET_DIRECTORY}/scripts
mkdir "${TARGET_DIRECTORY}"
mkdir "${TARGET_DIRECTORY}/contents"
cp -r ".mac_resources/scripts" "${TARGET_DIRECTORY}/scripts"
# copy cloudflared into the build directory
cp ${BINARY_NAME} {$TARGET_DIRECTORY}/contents/${PRODUCT}
cp ${BINARY_NAME} "${TARGET_DIRECTORY}/contents/${PRODUCT}"
# compress cloudflared into a tar and gzipped file
tar czf "$FILENAME" ${BINARY_NAME}
tar czf "$FILENAME" "${BINARY_NAME}"
# build the installer package
if [[ -n "${PKG_SIGN_NAME:-}" ]]; then
pkgbuild --identifier com.cloudflare.${PRODUCT} \
--version ${VERSION} \
--scripts ${TARGET_DIRECTORY}/scripts \
@ -104,6 +113,15 @@ pkgbuild --identifier com.cloudflare.${PRODUCT} \
--install-location /usr/local/bin \
--sign "${PKG_SIGN_NAME}" \
${PKGNAME}
else
pkgbuild --identifier com.cloudflare.${PRODUCT} \
--version ${VERSION} \
--scripts ${TARGET_DIRECTORY}/scripts \
--root ${TARGET_DIRECTORY}/contents \
--install-location /usr/local/bin \
${PKGNAME}
fi
# cleaning up the build directory
rm -rf $TARGET_DIRECTORY