Skip to content

Introduce .env.local as override layer on .env - #579

Closed
kieran-osgood-shopify wants to merge 1 commit into
graphite-base/579from
kieran-osgood/env-local-overlay
Closed

Introduce .env.local as override layer on .env#579
kieran-osgood-shopify wants to merge 1 commit into
graphite-base/579from
kieran-osgood/env-local-overlay

Conversation

@kieran-osgood-shopify

@kieran-osgood-shopify kieran-osgood-shopify commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

What changes are you making?

Introduces the .env.local as the user configurable .env file for Shopify Staff

.env will become generated in #580 at which point modifications to .env will be lost, .env.local is the persistent workaround to this


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.

@github-actions github-actions Bot added the #gsd:50662 Rebase Checkout Kit on UCP label Aug 5, 2026

kieran-osgood-shopify commented Aug 5, 2026

Copy link
Copy Markdown
Contributor Author

@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/env-local-overlay branch from a2ee887 to a02421c Compare August 5, 2026 11:06
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/apple-pay-merchant-identifier branch 2 times, most recently from 3326bed to ef9dbba Compare August 5, 2026 11:35
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/env-local-overlay branch 2 times, most recently from 131eb0a to eba4266 Compare August 5, 2026 11:45
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/apple-pay-merchant-identifier branch from ef9dbba to 578c24e Compare August 5, 2026 11:45
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/env-local-overlay branch from eba4266 to e94d61b Compare August 5, 2026 12:33
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/apple-pay-merchant-identifier branch from 578c24e to ff257a4 Compare August 5, 2026 12:33
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/env-local-overlay branch from e94d61b to 09826ea Compare August 6, 2026 15:48
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/apple-pay-merchant-identifier branch 2 times, most recently from 055b73d to 331300f Compare August 6, 2026 17:30
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/env-local-overlay branch 2 times, most recently from 3da5174 to 6c4b15a Compare August 7, 2026 11:05
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/apple-pay-merchant-identifier branch from 0b7623f to 97b992e Compare August 7, 2026 11:26
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/env-local-overlay branch 2 times, most recently from 6d1b182 to f69378a Compare August 7, 2026 13:51
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/apple-pay-merchant-identifier branch 2 times, most recently from 4652f31 to fd8babb Compare August 7, 2026 14:15
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/env-local-overlay branch from f69378a to 508a790 Compare August 7, 2026 14:15
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/apple-pay-merchant-identifier branch from fd8babb to e07a3ec Compare August 7, 2026 15:41
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/env-local-overlay branch from 508a790 to ab0ce29 Compare August 7, 2026 15:41
setup_storefront_env took the first match for a duplicated key while
run_maestro took the last. Last-wins is the predictable rule: in a file kept
by hand, the last uncommented assignment is the active one.

.env.local now overrides .env per key. Nothing writes to .env.local, so it
survives every sync and gives a developer a place to point the sample apps at
their own store.

Write decisions about .env deliberately ignore the overlay. Resolved values
carry overrides, so writing them back would make an override permanent. While
.env.local exists, .env is left alone and the reason is reported.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/env-local-overlay branch from ab0ce29 to 4f132b4 Compare August 10, 2026 09:08
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/apple-pay-merchant-identifier branch from e07a3ec to 2546e3f Compare August 10, 2026 09:08
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from kieran-osgood/apple-pay-merchant-identifier to graphite-base/579 August 10, 2026 14:01
@kieran-osgood-shopify kieran-osgood-shopify changed the title Let .env.local override .env, and resolve duplicate keys last-wins Introduce .env.local as override layer on .env Aug 12, 2026
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