Repository navigation
Conversation
Seven jobs repeated the steps that compute the Cocoa SDK cache key and restore the cache. They now call restore-cocoa-sdk, which replaces cocoa-cache-key and keeps the release-branch rule in one place. The device tests and warm-cocoa-cache still restore on release branches. After a cache miss every macOS job builds the Cocoa SDK at once, and only the first save stores anything: on the #5949 merge push five jobs saved and one main entry was created. Only build-sentry, which always builds the Cocoa SDK on a miss, and warm-cocoa-cache save the cache now. Refs #3852 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Good to approve, with optional comments
This PR has no linked issue. It fixes the cause, several jobs racing to save the same key. Every caller runs on xcode-27, and build-sentry-cocoa.sh builds the same SDKs whatever the job env, so one save from .NET (macos) produces the key that all of them restore.
- Optional:
device-tests-ios.yml: onrelease/*pushes,build.ymldoesn't save, so nothing saves a release-scoped cache now. If a release branch'smodules/sentry-cocoadiffers from main's, both device-test jobs rebuild Cocoa (~15 min each) on every push to it. The description accepts this trade-off. If it gets costly, one device-test job could keep a save gated onstartsWith(github.ref_name, 'release/'). - Optional:
warm-cocoa-cache.ymlis the only caller this PR's CI doesn't run. It hasworkflow_dispatch, so one manual run on this branch would cover therestore-on-release+lookup-onlypath, where the save key now comes from the composite'skeyoutput.
This is an automated preliminary review.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## ci/ios-trim-analysis #5963 +/- ##
========================================================
- Coverage 77.70% 77.69% -0.02%
========================================================
Files 535 535
Lines 19731 19731
Branches 3934 3934
========================================================
- Hits 15332 15330 -2
- Misses 3544 3545 +1
- Partials 855 856 +1 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stacked on #5961.
Seven jobs in
build.yml,device-tests-ios.ymlandwarm-cocoa-cache.ymlrepeated the same two steps to compute the Cocoa SDK cache key and restore the cache. They now call one composite action,restore-cocoa-sdk, which replacescocoa-cache-key. It skips the restore on release branches by default, because the Cocoa SDK ships inSentry.Bindings.Cocoaand release builds build it from source. The device tests and the cache-warming workflow still restore there, throughrestore-on-release.Only
.NET (macos)and the cache-warming workflow save the cache now. After a cache miss, every macOS job builds the Cocoa SDK at the same time, and only the first save stores anything. On the push that merged #5949, five jobs saved, andgh cache listshows a single main entry, from the first job to finish..NET (macos)runs on every PR that runs the build and always builds the Cocoa SDK on a miss, so one save there covers the others.Two things change. If
.NET (macos)fails before its Cocoa build finishes, nothing saves the cache in that run, so the next run builds it again. The device tests on release branches no longer save a cache of their own, so they use main's.actionlint reports nothing new, and it catches a misspelled input or output on the new action. The build and the iOS device tests run on this PR, so they cover every caller except
warm-cocoa-cache, which only runs on pushes to the version branches.#skip-changelog