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: error in deciding whether the current build should use open source only dependencies or not #2891

Merged
merged 5 commits into from
Apr 18, 2024

Conversation

AndroidBob
Copy link
Collaborator

@AndroidBob AndroidBob commented Apr 15, 2024

Cherry pick from the original PR:


⚠️ Conflicts during cherry-pick:
app/build.gradle.kts
kalium


PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like SQPIT-764
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

  1. fdroid build is failing on megazord.
  2. gms and other non free dependencies are added to the end build when building with megazord

Causes (Optional)

error in deciding whether the current build should use open source only dependencies or not was only checking if the gradle task it is currently running include the word fdroid or not e.g. ./gradlew :appCompileFdroidCompatReleaseSources this will work fine in most cases but not megazord, megazord tuns a shortened version of the task ./gradlew compileApp and append the build flavor and type form environment variables

Solutions

check the current build flavor from the environment variables first and then check the current gradle task

Needs releases with:

  • GitHub link to other pull request

Testing

manually tested with both fdroid and prod flavors on megazord ans it is all good

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

Briefly describe how this change was tested and if applicable the exact steps taken to verify that it works as expected.

Notes (Optional)

Specify here any other facts that you think are important for this issue.

Attachments (Optional)

Attachments like images, videos, etc. (drag and drop in the text box)


PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

@AndroidBob AndroidBob added the cherry-pick PR is cherry-picking changes from another banch label Apr 15, 2024
Copy link
Contributor

github-actions bot commented Apr 15, 2024

Test Results

900 tests  ±0   900 ✅ ±0   13m 41s ⏱️ + 5m 12s
122 suites ±0     0 💤 ±0 
122 files   ±0     0 ❌ ±0 

Results for commit 513c248. ± Comparison against base commit d2cc015.

♻️ This comment has been updated with latest results.

@AndroidBob
Copy link
Collaborator Author

Build 4207 failed.

Signed-off-by: MohamadJaara <mohamad.jaara@wire.com>
Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@AndroidBob
Copy link
Collaborator Author

Build 4214 succeeded.

The build produced the following APK's:

@MohamadJaara MohamadJaara enabled auto-merge April 17, 2024 19:23
@MohamadJaara MohamadJaara added this pull request to the merge queue Apr 18, 2024
Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

Merged via the queue into develop with commit 3b3a972 Apr 18, 2024
11 of 12 checks passed
@MohamadJaara MohamadJaara deleted the test/fdroid-playground-cherry-pick branch April 18, 2024 12:38
@AndroidBob
Copy link
Collaborator Author

Build 4302 succeeded.

The build produced the following APK's:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick PR is cherry-picking changes from another banch size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants