Skip to content

[Bitrise] Failover gracefully when run drifts from main#490

Open
kieran-osgood-shopify wants to merge 1 commit into
mainfrom
kieran-osgood/07-16-featimprovedebuggingandfailovercases
Open

[Bitrise] Failover gracefully when run drifts from main#490
kieran-osgood-shopify wants to merge 1 commit into
mainfrom
kieran-osgood/07-16-featimprovedebuggingandfailovercases

Conversation

@kieran-osgood-shopify

@kieran-osgood-shopify kieran-osgood-shopify commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

What changes are you making?

We had an issue where a branch contained the browserstack run plan changes but was stale behind main which had just merged support for swift/kotlin samples / e2e tests
This meant that the pipeline DAG was built from main, whilst the run plan was executed from the pre-merge PR head

A possible solution was to use the runplan from the PR HEAD rather than the pre-merge head but that would result in passing PR status and then failing on main, its not feasible to try and override, we can't change the DAG to be generated from the pre-merge state

The solution here is mostly just to fail gracefully, detect this drift, print a clear error, and provide the solution.

image.png

How to test


Before you merge

Important

  • I've added tests to support my implementation
  • I have read and agree with the Contribution Guidelines
  • I have read and agree with the Code of Conduct
  • I've updated the relevant platform README (platforms/swift/README.md and/or platforms/android/README.md)

Releasing a new Swift version?
  • I have bumped the version in ShopifyCheckoutKit.podspec
  • I have bumped the version in platforms/swift/Sources/ShopifyCheckoutKit/ShopifyCheckoutKit.swift
  • I have updated the SwiftPM/CocoaPods version snippets in platforms/swift/README.md (major version only)
Releasing a new Embedded Checkout Protocol version?
  • I have bumped embeddedCheckoutProtocolAndroid in platforms/android/gradle/libs.versions.toml
  • I have updated protocol/languages/kotlin/embedded-checkout-protocol/api/embedded-checkout-protocol.api if the public API changed
Releasing a new Android version?
  • I have bumped checkoutKitAndroid in platforms/android/gradle/libs.versions.toml
  • I have updated the Gradle/Maven version snippets in platforms/android/README.md

Tip

See the Contributing documentation for the full release process per platform.

@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/07-16-featimprovedebuggingandfailovercases branch 2 times, most recently from 65d5247 to 049b4f5 Compare July 16, 2026 16:33
@kieran-osgood-shopify
kieran-osgood-shopify marked this pull request as ready for review July 16, 2026 16:52
@kieran-osgood-shopify
kieran-osgood-shopify requested a review from a team as a code owner July 16, 2026 16:52
@kieran-osgood-shopify kieran-osgood-shopify changed the title feat: improve debugging and failover cases [Bitrise] Failover gracefully when run drifts from main Jul 16, 2026
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from kieran-osgood/07-15-feataddswiftkotlintophatinstallrows to graphite-base/490 July 16, 2026 16:55
@bitrise

bitrise Bot commented Jul 16, 2026

Copy link
Copy Markdown

Install this build

Open Tophat, select your target device, then click Install. Links open on the Mac running Tophat.

SDK Install
React Native Install with Tophat
Swift Install with Tophat
Kotlin Install with Tophat

Checkout Kit E2E results

Status Suite Target Platform OS version tag Device
tests/shared/launch-smoke.yaml react-native ios latest iPhone 15
iOS 27 Beta
tests/shared/launch-smoke.yaml react-native android latest Google Pixel 9
Android 17.0
tests/shared/launch-smoke.yaml kotlin android latest Google Pixel 9
Android 17.0
tests/shared/launch-smoke.yaml swift ios latest iPhone 15
iOS 27 Beta

@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/07-16-featimprovedebuggingandfailovercases branch from 049b4f5 to 137cd3c Compare July 16, 2026 17:07
@graphite-app
graphite-app Bot changed the base branch from graphite-base/490 to main July 16, 2026 17:08
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/07-16-featimprovedebuggingandfailovercases branch from 137cd3c to a13b1ad Compare July 16, 2026 17:08
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/07-16-featimprovedebuggingandfailovercases branch from a13b1ad to 3f8045b Compare July 17, 2026 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

#gsd:50662 Rebase Checkout Kit on UCP

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant