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

Change up the nimbus-fml.sh script and split up the nimbus.fml.yaml file. #11263

Merged
merged 1 commit into from
Oct 19, 2022

Conversation

jhugman
Copy link
Contributor

@jhugman jhugman commented Jul 13, 2022

This PR is now ready to merge, but for when firefox-ios takes the (currently unreleased) upgrade which contains the EXP-2333 epic implementing the FML Imports and Includes proposal.

This PR does not go very far in splitting up the nimbus.fml.yaml file; I could go further, but would like to get some feedback before proceeding.

The last PR this was waiting for was mozilla/application-services#5042 , which was released as part of App Services release v93.7.0 .

This PR splits out the app-specific configuration of the nimbus-fml call, into two config files:

  • nimbus-fml-configuration.sh, and optionally:
  • nimbus-fml-configuration.local.sh. This file overrides anything in the first, and is intended for local development.

It also derives the version of App Services, ensuring that the version of the megazord and FML stay in sync.


Thank you for submitting a pull request, your contributions are greatly appreciated!

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Please make sure you've run the test scheme and all the tests pass. If your changes affect existing tests please make sure to update the tests as well.

Below is the PR naming guidelines we follow:

https://github.com/mozilla-mobile/firefox-ios/wiki/Pull-Request-Naming-Guide

@adudenamedruby adudenamedruby added the Do Not Merge ⛔️ This issue is a work in progress and is not ready to land label Jul 13, 2022
Copy link
Contributor

@adudenamedruby adudenamedruby left a comment

Choose a reason for hiding this comment

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

This is great work. As per our conversation, I can take on the rest of the splitting work, that's no worries.

I'll add Do Not Merge label for now so we don't accidentally get this in. :)

@jhugman jhugman force-pushed the jhugman/exp-2605-get-ready-for-nimbus-fml branch from febab66 to 45858ee Compare July 19, 2022 10:51
@mergify
Copy link
Contributor

mergify bot commented Aug 9, 2022

This pull request has conflicts when rebasing. Could you fix it @jhugman?

1 similar comment
@mergify
Copy link
Contributor

mergify bot commented Sep 23, 2022

This pull request has conflicts when rebasing. Could you fix it @jhugman?

@jhugman jhugman force-pushed the jhugman/exp-2605-get-ready-for-nimbus-fml branch from 45858ee to 19d9abe Compare October 18, 2022 12:18
@adudenamedruby adudenamedruby removed the Do Not Merge ⛔️ This issue is a work in progress and is not ready to land label Oct 19, 2022
@adudenamedruby
Copy link
Contributor

Will test & review today.

@adudenamedruby
Copy link
Contributor

BR is green. Screen Shot 2022-10-19 at 3 42 22 PM

@adudenamedruby adudenamedruby merged commit 8ff58f1 into main Oct 19, 2022
@adudenamedruby adudenamedruby deleted the jhugman/exp-2605-get-ready-for-nimbus-fml branch October 19, 2022 19:44
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.

None yet

2 participants