Updated CHANGELOG.md and Makefile (#376)

Co-authored-by: Robert <[email protected]>
bugsnag · Jan 20, 2025 · 120fbd4 · 120fbd4
1 parent be1aa70
commit 120fbd4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ Changelog
 
 * View load spans are now not first class by default, and don't set the current context.
   [369](https://github.com/bugsnag/bugsnag-cocoa-performance/pull/369)
+
+### Enhancements
+
+* Added mechanism for delivering external spans with natively-captured metrics (for initial use with React Native rendering metrics)
+  [373](https://github.com/bugsnag/bugsnag-cocoa-performance/pull/373)
 
 ## 1.11.0 (2025-01-13)
 

diff --git a/Makefile b/Makefile
@@ -179,17 +179,16 @@ endif
 	# Swift Package Manager prefers tags to be unprefixed package versions
 	@git tag $(PRESET_VERSION)
 	@git push origin v$(PRESET_VERSION) $(PRESET_VERSION)
-	@git checkout next
-	@git rebase origin/next
-	@git merge main
-	@git push origin next
+	# Synchronize main and next
+	@open "https://github.com/bugsnag/bugsnag-cocoa-performance/compare/next...main?expand=1&title=Sync%20main%20into%20next"
+	@./scripts/build-xcframework.sh
 	# Prep GitHub release
 	# We could technically do a `hub release` here but a verification step
 	# before it goes live always seems like a good thing
 	@open 'https://github.com/bugsnag/bugsnag-cocoa-performance/releases/new?title=v$(PRESET_VERSION)&tag=v$(PRESET_VERSION)&body='$$(awk 'start && /^## /{exit;};/^## /{start=1;next};start' CHANGELOG.md | hexdump -v -e '/1 "%02x"' | sed 's/\(..\)/%\1/g')
 	# Workaround for CocoaPods/CocoaPods#8000
 	@EXPANDED_CODE_SIGN_IDENTITY="" EXPANDED_CODE_SIGN_IDENTITY_NAME="" EXPANDED_PROVISIONING_PROFILE="" pod trunk push --allow-warnings BugsnagPerformance.podspec.json
-	@EXPANDED_CODE_SIGN_IDENTITY="" EXPANDED_CODE_SIGN_IDENTITY_NAME="" EXPANDED_PROVISIONING_PROFILE="" pod trunk push --allow-warnings BugsnagPerformanceSwift.podspec.json
+	@EXPANDED_CODE_SIGN_IDENTITY="" EXPANDED_CODE_SIGN_IDENTITY_NAME="" EXPANDED_PROVISIONING_PROFILE="" pod trunk push --allow-warnings --synchronous BugsnagPerformanceSwift.podspec.json
 
 bump: ## Bump the version numbers to $VERSION
 ifeq ($(VERSION),)