Release 2024.8.1

- The build artifacts must be placed in the checkout directory so that they can be picked up from cfsetup

.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,56 +145,50 @@ 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
-    codesign -s "${CODE_SIGN_NAME}" -f -v --timestamp --options runtime ${BINARY_NAME}
-    
-   # notarize the binary
-   # TODO: TUN-5789
-  fi
+# sign the cloudflared binary
+if [[ ! -z "$CODE_SIGN_NAME" ]]; then
+  codesign -s "${CODE_SIGN_NAME}" -f -v --timestamp --options runtime ${BINARY_NAME}
 
-  ARCH_TARGET_DIRECTORY="${TARGET_DIRECTORY}/${arch}-build"
-  # creating build directory
-  rm -rf $ARCH_TARGET_DIRECTORY
-  mkdir -p "${ARCH_TARGET_DIRECTORY}"
-  mkdir -p "${ARCH_TARGET_DIRECTORY}/contents"
-  cp -r ".mac_resources/scripts" "${ARCH_TARGET_DIRECTORY}/scripts"
+ # notarize the binary
+ # TODO: TUN-5789
+fi
 
-  # copy cloudflared into the build directory
-  cp ${BINARY_NAME} "${ARCH_TARGET_DIRECTORY}/contents/${PRODUCT}"
+ARCH_TARGET_DIRECTORY="${TARGET_DIRECTORY}/${TARGET_ARCH}-build"
+# creating build directory
+rm -rf $ARCH_TARGET_DIRECTORY
+mkdir -p "${ARCH_TARGET_DIRECTORY}"
+mkdir -p "${ARCH_TARGET_DIRECTORY}/contents"
+cp -r ".mac_resources/scripts" "${ARCH_TARGET_DIRECTORY}/scripts"
 
-  # compress cloudflared into a tar and gzipped file
-  tar czf "$FILENAME" "${BINARY_NAME}"
+# copy cloudflared into the build directory
+cp ${BINARY_NAME} "${ARCH_TARGET_DIRECTORY}/contents/${PRODUCT}"
 
-  # build the installer package
-  if [[ ! -z "$PKG_SIGN_NAME" ]]; then
+# compress cloudflared into a tar and gzipped file
+tar czf "$FILENAME" "${BINARY_NAME}"
+
+# build the installer package
+if [[ ! -z "$PKG_SIGN_NAME" ]]; then
+  pkgbuild --identifier com.cloudflare.${PRODUCT} \
+      --version ${VERSION} \
+      --scripts ${ARCH_TARGET_DIRECTORY}/scripts \
+      --root ${ARCH_TARGET_DIRECTORY}/contents \
+      --install-location /usr/local/bin \
+      --sign "${PKG_SIGN_NAME}" \
+      ${PKGNAME}
+
+      # notarize the package
+      # TODO: TUN-5789
+else
     pkgbuild --identifier com.cloudflare.${PRODUCT} \
-        --version ${VERSION} \
-        --scripts ${ARCH_TARGET_DIRECTORY}/scripts \
-        --root ${ARCH_TARGET_DIRECTORY}/contents \
-        --install-location /usr/local/bin \
-        --sign "${PKG_SIGN_NAME}" \
-        ${PKGNAME}
-
-        # notarize the package
-        # TODO: TUN-5789
-  else
-      pkgbuild --identifier com.cloudflare.${PRODUCT} \
-        --version ${VERSION} \
-        --scripts ${ARCH_TARGET_DIRECTORY}/scripts \
-        --root ${ARCH_TARGET_DIRECTORY}/contents \
-        --install-location /usr/local/bin \
-        ${PKGNAME}
-  fi
-done
+      --version ${VERSION} \
+      --scripts ${ARCH_TARGET_DIRECTORY}/scripts \
+      --root ${ARCH_TARGET_DIRECTORY}/contents \
+      --install-location /usr/local/bin \
+      ${PKGNAME}
+fi
 
 # cleanup build directory because this script is not ran within containers,
 # which might lead to future issues in subsequent runs.

Makefile

@@ -218,6 +218,10 @@ cloudflared-pkg: cloudflared cloudflared.1
 cloudflared-msi:
 	wixl --define Version=$(VERSION) --define Path=$(EXECUTABLE_PATH) --output cloudflared-$(VERSION)-$(TARGET_ARCH).msi cloudflared.wxs
 
+.PHONY: github-release-dryrun
+github-release-dryrun:
+	python3 github_release.py --path $(PWD)/built_artifacts --release-version $(VERSION) --dry-run
+
 .PHONY: github-release
 github-release:
 	python3 github_release.py --path $(PWD)/built_artifacts --release-version $(VERSION)

RELEASE_NOTES

@@ -1,3 +1,12 @@
+2024.8.1
+- 2024-08-01 TUN-8581: create dry run for github release
+
+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
 

cfsetup.yaml

@@ -195,9 +195,23 @@ buster: &buster
       - component-tests/requirements.txt
     pre-cache: *component_test_pre_cache
     post-cache: *component_test_post_cache
+  github-release-dryrun:
+    build_dir: *build_dir
+    builddeps:
+      - *pinned_go
+      - build-essential
+      - python3-dev
+      - libffi-dev
+      - python3-setuptools
+      - python3-pip
+    pre-cache:
+      - pip3 install pynacl==1.4.0
+      - pip3 install pygithub==1.55
+    post-cache:
+      - make github-release-dryrun
   github-release:
     build_dir: *build_dir
-    builddeps: 
+    builddeps:
       - *pinned_go
       - build-essential
       - python3-dev
@@ -209,7 +223,6 @@ buster: &buster
       - pip3 install pygithub==1.55
     post-cache:
       - make github-release
-      - make github-message
   r2-linux-release:
     build_dir: *build_dir
     builddeps:

github_release.py

@@ -17,7 +17,7 @@ import re
 from github import Github, GithubException, UnknownObjectException
 
 FORMAT = "%(levelname)s - %(asctime)s: %(message)s"
-logging.basicConfig(format=FORMAT)
+logging.basicConfig(format=FORMAT, level=logging.INFO)
 
 CLOUDFLARED_REPO = os.environ.get("GITHUB_REPO", "cloudflare/cloudflared")
 GITHUB_CONFLICT_CODE = "already_exists"
@@ -219,7 +219,15 @@ def main():
         release = get_or_create_release(repo, args.release_version, args.dry_run)
 
         if args.dry_run:
-            logging.info("Skipping asset upload because of dry-run")
+            if os.path.isdir(args.path):
+                onlyfiles = [f for f in listdir(args.path) if isfile(join(args.path, f))]
+                for filename in onlyfiles:
+                    binary_path = os.path.join(args.path, filename)
+                    logging.info("binary: " + binary_path)
+            elif os.path.isfile(args.path):
+                logging.info("binary: " + binary_path)
+            else:
+                logging.error("dryrun failed")
             return
 
         if os.path.isdir(args.path):