Skip to content

Commit

Permalink
TUN-8546: Fix final artifacts paths
Browse files Browse the repository at this point in the history
- The build artifacts must be placed in the checkout directory so that they can be picked up from cfsetup
  • Loading branch information
lmpn committed Jul 31, 2024
1 parent 3bb3d71 commit c7cd4e0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .teamcity/mac/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ INSTALLER_CERT="installer.cer"
BUNDLE_ID="com.cloudflare.cloudflared"
SEC_DUP_MSG="security: SecKeychainItemImport: The specified item already exists in the keychain."
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/
cp -r . ../src/github.com/cloudflare/cloudflared
cd ../src/github.com/cloudflare/cloudflared
Expand Down Expand Up @@ -144,8 +146,6 @@ fi
# cleanup the build directory because the previous execution might have failed without cleaning up.
rm -rf "${TARGET_DIRECTORY}"
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

# sign the cloudflared binary
Expand All @@ -156,7 +156,7 @@ if [[ ! -z "$CODE_SIGN_NAME" ]]; then
# TODO: TUN-5789
fi

ARCH_TARGET_DIRECTORY="${TARGET_DIRECTORY}/${arch}-build"
ARCH_TARGET_DIRECTORY="${TARGET_DIRECTORY}/${TARGET_ARCH}-build"
# creating build directory
rm -rf $ARCH_TARGET_DIRECTORY
mkdir -p "${ARCH_TARGET_DIRECTORY}"
Expand Down

0 comments on commit c7cd4e0

Please sign in to comment.