Merge branch 'cloudflare:master' into tunnel-health

.teamcity/mac/build.sh

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

RELEASE_NOTES

@@ -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-07-16 TUN-8543: use -p flag to create intermediate directories