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

TUN-8546: Fix final artifacts paths 

- The build artifacts must be placed in the checkout directory so that they can be picked up from cfsetup
This commit is contained in:
lneto 2024-07-31 15:51:02 +01:00 committed by Luis Neto
parent 3bb3d71093
commit c7cd4e02b8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.teamcity/mac/build.sh vendored
View File

@ -29,6 +29,8 @@ INSTALLER_CERT="installer.cer"
BUNDLE_ID="com.cloudflare.cloudflared" BUNDLE_ID="com.cloudflare.cloudflared"
SEC_DUP_MSG="security: SecKeychainItemImport: The specified item already exists in the keychain." SEC_DUP_MSG="security: SecKeychainItemImport: The specified item already exists in the keychain."
export PATH="$PATH:/usr/local/bin" export PATH="$PATH:/usr/local/bin"
FILENAME="$(pwd)/artifacts/cloudflared-darwin-$TARGET_ARCH.tgz"
PKGNAME="$(pwd)/artifacts/cloudflared-$TARGET_ARCH.pkg"
mkdir -p ../src/github.com/cloudflare/ mkdir -p ../src/github.com/cloudflare/
cp -r . ../src/github.com/cloudflare/cloudflared cp -r . ../src/github.com/cloudflare/cloudflared
cd ../src/github.com/cloudflare/cloudflared cd ../src/github.com/cloudflare/cloudflared
@ -144,8 +146,6 @@ fi
# cleanup the build directory because the previous execution might have failed without cleaning up. # cleanup the build directory because the previous execution might have failed without cleaning up.
rm -rf "${TARGET_DIRECTORY}" rm -rf "${TARGET_DIRECTORY}"
export TARGET_OS="darwin" export TARGET_OS="darwin"
FILENAME="$(pwd)/artifacts/cloudflared-darwin-$TARGET_ARCH.tgz"
PKGNAME="$(pwd)/artifacts/cloudflared-$TARGET_ARCH.pkg"
GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared
# sign the cloudflared binary # sign the cloudflared binary
@ -156,7 +156,7 @@ if [[ ! -z "$CODE_SIGN_NAME" ]]; then
# TODO: TUN-5789 # TODO: TUN-5789
fi fi
ARCH_TARGET_DIRECTORY="${TARGET_DIRECTORY}/${arch}-build" ARCH_TARGET_DIRECTORY="${TARGET_DIRECTORY}/${TARGET_ARCH}-build"
# creating build directory # creating build directory
rm -rf $ARCH_TARGET_DIRECTORY rm -rf $ARCH_TARGET_DIRECTORY
mkdir -p "${ARCH_TARGET_DIRECTORY}" mkdir -p "${ARCH_TARGET_DIRECTORY}"