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

Merge branch 'cloudflare:master' into tunnel-health

This commit is contained in:
Mads Jon Nielsen 2024-08-01 10:46:25 +02:00 committed by GitHub
parent 037f056d0c c7f0f90bed
commit bec84aeb7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,12 @@ if [[ "$(uname)" != "Darwin" ]] ; then
exit 1 exit 1
fi fi
if [[ "amd64" != "${TARGET_ARCH}" && "arm64" != "${TARGET_ARCH}" ]]
then
echo "TARGET_ARCH must be amd64 or arm64"
exit 1
fi
go version go version
export GO111MODULE=on export GO111MODULE=on
@ -23,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
@ -137,13 +145,8 @@ 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}"
archs=("amd64" "arm64") export TARGET_OS="darwin"
export TARGET_OS=darwin GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared
for arch in ${archs[@]}; do
FILENAME="$(pwd)/artifacts/cloudflared-darwin-$arch.tgz"
PKGNAME="$(pwd)/artifacts/cloudflared-$arch.pkg"
TARGET_ARCH=$arch GOCACHE="$PWD/../../../../" GOPATH="$PWD/../../../../" CGO_ENABLED=1 make cloudflared
# sign the cloudflared binary # sign the cloudflared binary
if [[ ! -z "$CODE_SIGN_NAME" ]]; then if [[ ! -z "$CODE_SIGN_NAME" ]]; then
@ -153,7 +156,7 @@ for arch in ${archs[@]}; do
# 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}"
@ -186,7 +189,6 @@ for arch in ${archs[@]}; do
--install-location /usr/local/bin \ --install-location /usr/local/bin \
${PKGNAME} ${PKGNAME}
fi fi
done
# cleanup build directory because this script is not ran within containers, # cleanup build directory because this script is not ran within containers,
# which might lead to future issues in subsequent runs. # which might lead to future issues in subsequent runs.

6
RELEASE_NOTES
View File

@ -1,3 +1,9 @@
2024.7.3
- 2024-07-31 TUN-8546: Fix final artifacts paths
2024.7.2
- 2024-07-17 TUN-8546: rework MacOS build script
2024.7.1 2024.7.1
- 2024-07-16 TUN-8543: use -p flag to create intermediate directories - 2024-07-16 TUN-8543: use -p flag to create intermediate directories