Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge remote and local app configs after setting git refs #442

Merged
merged 7 commits into from
Dec 3, 2024

Conversation

bsquizz
Copy link
Collaborator

@bsquizz bsquizz commented Dec 2, 2024

Fixes #441

If a git ref is set on a component in the local config, it should take precedence over the remote config.

  • Wait to merge remote config with local config until AFTER we set the git refs for all components
  • Add better debug logging around the config merge
  • Tweak unit tests to properly test this scenario

@bsquizz bsquizz changed the title Merge remote and local app configs after setting git refs WIP: Merge remote and local app configs after setting git refs Dec 2, 2024
@bsquizz bsquizz changed the title WIP: Merge remote and local app configs after setting git refs Merge remote and local app configs after setting git refs Dec 3, 2024
Copy link
Collaborator

@adamrdrew adamrdrew left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. I have no changes to suggest.

@bsquizz bsquizz merged commit 2213621 into master Dec 3, 2024
14 checks passed
@bsquizz bsquizz deleted the fix_ref_override branch December 3, 2024 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ref always updated overriding local config value
2 participants