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

Fix Nimbus gradle plugin issues [firefox-android: gabrielluong:1818826] #5421

Merged
merged 3 commits into from
Mar 8, 2023

Conversation

jeddai
Copy link
Member

@jeddai jeddai commented Mar 6, 2023

This resolves two issues:

  1. The Nimbus gradle plugin will now include the generated files in the sources by default
  2. It will now ensure all compilation tasks depend on the nimbus task

Pull Request checklist

  • Quality: This PR builds and tests run cleanly
    • Note:
      • For changes that need extra cross-platform testing, consider adding [ci full] to the PR title.
      • If this pull request includes a breaking change, consider cutting a new release after merging.
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Changelog: This PR includes a changelog entry in CHANGES_UNRELEASED.md or an explanation of why it does not need one
    • Any breaking changes to Swift or Kotlin binding APIs are noted explicitly
  • Dependencies: This PR follows our dependency management guidelines
    • Any new dependencies are accompanied by a summary of the due dilligence applied in selecting them.

Branch builds: add [firefox-android: branch-name] to the PR title.

@jeddai jeddai changed the title Fix Nimbus gradle plugin issues Fix Nimbus gradle plugin issues [firefox-android: gabrielluong:1818826] Mar 6, 2023
@jeddai jeddai requested review from jhugman and gabrielluong March 6, 2023 20:28
@jeddai jeddai closed this Mar 6, 2023
@jeddai jeddai reopened this Mar 6, 2023
@jeddai
Copy link
Member Author

jeddai commented Mar 7, 2023

Something I've found with this is dependency substitution does not seem to function for the plugin. Not sure how to resolve that, but I can provide steps to test these changes if you'd like them @gabrielluong

Copy link
Contributor

@jhugman jhugman left a comment

Choose a reason for hiding this comment

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

This appears to work fine.

The theory we have is that the SNAPSHOT subsititution isn't working, but it should be fixed in another ticket. Could you file another ticket to fix that task?

✅ in the meantime. Thanks Charlie.

@jeddai
Copy link
Member Author

jeddai commented Mar 7, 2023

The theory we have is that the SNAPSHOT subsititution isn't working, but it should be fixed in another ticket. Could you file another ticket to fix that task?

Yeah so the issue is specifically substitution within the buildscript block. I'll file another ticket and I have some initial findings to share on it

@jeddai
Copy link
Member Author

jeddai commented Mar 7, 2023

Ooooookay so a few things with this PR:

  1. The branch build is going to fail because dependencies in the buildscript block are not substituted by the a-s code yet. That will be adjusted as a part of this ticket (EXP-3239).
  2. The swiftlint is (was?) failing for reasons unrelated to my changes

I'm not sure how to override the failing build to merge, any advice there would be great.

@tarikeshaq
Copy link
Contributor

I'm not sure how to override the failing build to merge, any advice there would be great.

You click the Squash and merge button, as long a run-tests passes (which it does!) that button should be clickable

image

If we're landing this, I'd like to confirm that this does not break branch builds, and just breaks branch builds against the fork you're building against? i.e when it comes to other engineers launching branch builds, their branch builds should work fine.. if it's not, that may also be okay, as long as we're aware of which failures are temporary so we can ignore them

@jeddai
Copy link
Member Author

jeddai commented Mar 8, 2023 via email

@jeddai jeddai merged commit 3c6e27c into mozilla:main Mar 8, 2023
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.

3 participants